From c71f2d7425722323d01799540fcd676abd28c0ee Mon Sep 17 00:00:00 2001 From: Les Lee Date: Thu, 20 Jan 2022 18:27:02 +0800 Subject: [PATCH] wifi data usage: Update calling API name Bug: 213387087 Test: atest -c NetworkTemplateTest Test: atest -c NetworkStatsServiceTest Test: atest -c FrameworksWifiApiTests Test: atest -c NetworkPolicyManagerServiceTest Change-Id: I6f65af5e2ff121a2fe5b2429d3eead01e434f8be Merged-In: I6f65af5e2ff121a2fe5b2429d3eead01e434f8be --- tests/unit/java/android/net/NetworkTemplateTest.kt | 2 +- .../java/com/android/server/net/NetworkStatsServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/java/android/net/NetworkTemplateTest.kt b/tests/unit/java/android/net/NetworkTemplateTest.kt index 0c3bee3c3d..048597ffc7 100644 --- a/tests/unit/java/android/net/NetworkTemplateTest.kt +++ b/tests/unit/java/android/net/NetworkTemplateTest.kt @@ -95,7 +95,7 @@ class NetworkTemplateTest { oemManaged: Int = OEM_NONE, metered: Boolean = true ): NetworkStateSnapshot { - `when`(mockWifiInfo.getCurrentNetworkKey()).thenReturn(wifiKey) + `when`(mockWifiInfo.getNetworkKey()).thenReturn(wifiKey) val lp = LinkProperties() val caps = NetworkCapabilities().apply { setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED, !metered) diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java index 5e1699ad47..d7bbf5018a 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java @@ -266,7 +266,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { mServiceContext = new MockContext(context); when(mLocationPermissionChecker.checkCallersLocationPermission( any(), any(), anyInt(), anyBoolean(), any())).thenReturn(true); - when(sWifiInfo.getCurrentNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY); + when(sWifiInfo.getNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY); mStatsDir = TestIoUtils.createTemporaryDirectory(getClass().getSimpleName()); PowerManager powerManager = (PowerManager) mServiceContext.getSystemService(