From 14133c117dde047492f188e6183667ec7f1a631b Mon Sep 17 00:00:00 2001 From: junyulai Date: Wed, 30 Dec 2020 19:03:32 +0800 Subject: [PATCH] [FUI09] Expose NetworkStateSnapshot as system API This is needed by NetworkStatsService and NetworkPolicyManagerService to utilize the snapshots of information of networks that grabbed from ConnectivityService. Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest Bug: 174123988 Change-Id: I7e974ef7b23ba9ba6ee775eed9899b0c0e2eca55 --- .../core/java/com/android/server/ConnectivityService.java | 4 ++-- .../net/common/java/android/net/NetworkStateSnapshotTest.kt | 6 +++--- tests/net/java/android/net/NetworkTemplateTest.kt | 2 +- .../com/android/server/net/NetworkStatsServiceTest.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index d24be9db83..82d606579e 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -7952,8 +7952,8 @@ public class ConnectivityService extends IConnectivityManager.Stub final ArrayList snapshots = new ArrayList<>(); // TODO: Directly use NetworkStateSnapshot when feasible. for (final NetworkState state : getAllNetworkState()) { - final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.linkProperties, - state.networkCapabilities, state.network, state.subscriberId, + final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.network, + state.networkCapabilities, state.linkProperties, state.subscriberId, state.legacyNetworkType); snapshots.add(snapshot); } diff --git a/tests/net/common/java/android/net/NetworkStateSnapshotTest.kt b/tests/net/common/java/android/net/NetworkStateSnapshotTest.kt index 56b56efd50..0ca4d9551f 100644 --- a/tests/net/common/java/android/net/NetworkStateSnapshotTest.kt +++ b/tests/net/common/java/android/net/NetworkStateSnapshotTest.kt @@ -63,10 +63,10 @@ class NetworkStateSnapshotTest { @Test fun testParcelUnparcel() { - val emptySnapshot = NetworkStateSnapshot(LinkProperties(), NetworkCapabilities(), - Network(TEST_NETID), null, TYPE_NONE) + val emptySnapshot = NetworkStateSnapshot(Network(TEST_NETID), NetworkCapabilities(), + LinkProperties(), null, TYPE_NONE) val snapshot = NetworkStateSnapshot( - TEST_LINK_PROPERTIES, TEST_CAPABILITIES, Network(TEST_NETID), TEST_IMSI, TYPE_WIFI) + Network(TEST_NETID), TEST_CAPABILITIES, TEST_LINK_PROPERTIES, TEST_IMSI, TYPE_WIFI) assertParcelSane(emptySnapshot, 5) assertParcelSane(snapshot, 5) } diff --git a/tests/net/java/android/net/NetworkTemplateTest.kt b/tests/net/java/android/net/NetworkTemplateTest.kt index 74c6473675..64b774cc43 100644 --- a/tests/net/java/android/net/NetworkTemplateTest.kt +++ b/tests/net/java/android/net/NetworkTemplateTest.kt @@ -79,7 +79,7 @@ class NetworkTemplateTest { setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, (oemManaged and OEM_PRIVATE) == OEM_PRIVATE) } - return NetworkStateSnapshot(lp, caps, mock(Network::class.java), subscriberId, type) + return NetworkStateSnapshot(mock(Network::class.java), caps, lp, subscriberId, type) } private fun NetworkTemplate.assertMatches(ident: NetworkIdentity) = diff --git a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java index 6c4532e6e4..9334e2c4ad 100644 --- a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java @@ -1579,7 +1579,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true); capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); capabilities.setSSID(TEST_SSID); - return new NetworkStateSnapshot(prop, capabilities, WIFI_NETWORK, null, TYPE_WIFI); + return new NetworkStateSnapshot(WIFI_NETWORK, capabilities, prop, null, TYPE_WIFI); } private static NetworkStateSnapshot buildMobile3gState(String subscriberId) { @@ -1594,7 +1594,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, !isRoaming); capabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); return new NetworkStateSnapshot( - prop, capabilities, MOBILE_NETWORK, subscriberId, TYPE_MOBILE); + MOBILE_NETWORK, capabilities, prop, subscriberId, TYPE_MOBILE); } private NetworkStats buildEmptyStats() { @@ -1612,7 +1612,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { capabilities.setCapability(nc, true); } capabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); - return new NetworkStateSnapshot(prop, capabilities, MOBILE_NETWORK, subscriberId, + return new NetworkStateSnapshot(MOBILE_NETWORK, capabilities, prop, subscriberId, TYPE_MOBILE); }