LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: aaa0b58b76

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8eb6681328ad1f4a85bcc8c6c4b9446c23616b7a
This commit is contained in:
Treehugger Robot
2021-03-02 20:52:02 +00:00
committed by Automerger Merge Worker
parent f147fdffb1 aaa0b58b76
commit 6e281a3241
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -7952,8 +7952,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
final ArrayList<NetworkStateSnapshot> snapshots = new ArrayList<>(); final ArrayList<NetworkStateSnapshot> snapshots = new ArrayList<>();
// TODO: Directly use NetworkStateSnapshot when feasible. // TODO: Directly use NetworkStateSnapshot when feasible.
for (final NetworkState state : getAllNetworkState()) { for (final NetworkState state : getAllNetworkState()) {
final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.linkProperties, final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.network,
state.networkCapabilities, state.network, state.subscriberId, state.networkCapabilities, state.linkProperties, state.subscriberId,
state.legacyNetworkType); state.legacyNetworkType);
snapshots.add(snapshot); snapshots.add(snapshot);
} }

6
tests/net/common/java/android/net/NetworkStateSnapshotTest.kt
View File

@@ -63,10 +63,10 @@ class NetworkStateSnapshotTest {
@Test @Test
fun testParcelUnparcel() { fun testParcelUnparcel() {
val emptySnapshot = NetworkStateSnapshot(LinkProperties(), NetworkCapabilities(), val emptySnapshot = NetworkStateSnapshot(Network(TEST_NETID), NetworkCapabilities(),
Network(TEST_NETID), null, TYPE_NONE) LinkProperties(), null, TYPE_NONE)
val snapshot = NetworkStateSnapshot( 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(emptySnapshot, 5)
assertParcelSane(snapshot, 5) assertParcelSane(snapshot, 5)
} }

2
tests/net/java/android/net/NetworkTemplateTest.kt
View File

@@ -79,7 +79,7 @@ class NetworkTemplateTest {
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE,
(oemManaged and OEM_PRIVATE) == 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) = private fun NetworkTemplate.assertMatches(ident: NetworkIdentity) =

6
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -1579,7 +1579,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true); capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true);
capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
capabilities.setSSID(TEST_SSID); 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) { private static NetworkStateSnapshot buildMobile3gState(String subscriberId) {
@@ -1594,7 +1594,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, !isRoaming); capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, !isRoaming);
capabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); capabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
return new NetworkStateSnapshot( return new NetworkStateSnapshot(
prop, capabilities, MOBILE_NETWORK, subscriberId, TYPE_MOBILE); MOBILE_NETWORK, capabilities, prop, subscriberId, TYPE_MOBILE);
} }
private NetworkStats buildEmptyStats() { private NetworkStats buildEmptyStats() {
@@ -1612,7 +1612,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
capabilities.setCapability(nc, true); capabilities.setCapability(nc, true);
} }
capabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); capabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
return new NetworkStateSnapshot(prop, capabilities, MOBILE_NETWORK, subscriberId, return new NetworkStateSnapshot(MOBILE_NETWORK, capabilities, prop, subscriberId,
TYPE_MOBILE); TYPE_MOBILE);
} }