Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500 Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70
This commit is contained in:
@@ -8584,11 +8584,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
final UnderlyingNetworkInfo[] underlyingNetworkInfos = getAllVpnInfo();
|
final UnderlyingNetworkInfo[] underlyingNetworkInfos = getAllVpnInfo();
|
||||||
try {
|
try {
|
||||||
final ArrayList<NetworkStateSnapshot> snapshots = new ArrayList<>();
|
final ArrayList<NetworkStateSnapshot> snapshots = new ArrayList<>();
|
||||||
// TODO: Directly use NetworkStateSnapshot when feasible.
|
for (final NetworkStateSnapshot snapshot : getAllNetworkStateSnapshots()) {
|
||||||
for (final NetworkState state : getAllNetworkState()) {
|
|
||||||
final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.network,
|
|
||||||
state.networkCapabilities, state.linkProperties, state.subscriberId,
|
|
||||||
state.legacyNetworkType);
|
|
||||||
snapshots.add(snapshot);
|
snapshots.add(snapshot);
|
||||||
}
|
}
|
||||||
mStatsManager.notifyNetworkStatus(getDefaultNetworks(),
|
mStatsManager.notifyNetworkStatus(getDefaultNetworks(),
|
||||||
|
|||||||
Reference in New Issue
Block a user