Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0069e7e2 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge changes I3ba50cbd,I970ee365 into sc-dev am: b987babf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500

Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70
parents cfea2411 b987babf

packages/Connectivity/service/src/com/android/server/ConnectivityService.java

+1 −5
Original line number Diff line number Diff line
@@ -8584,11 +8584,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        final UnderlyingNetworkInfo[] underlyingNetworkInfos = getAllVpnInfo();

        try {

            final ArrayList<NetworkStateSnapshot> snapshots = new ArrayList<>();

            // TODO: Directly use NetworkStateSnapshot when feasible.

            for (final NetworkState state : getAllNetworkState()) {

                final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.network,

                        state.networkCapabilities, state.linkProperties, state.subscriberId,

                        state.legacyNetworkType);

            for (final NetworkStateSnapshot snapshot : getAllNetworkStateSnapshots()) {

                snapshots.add(snapshot);

            }

            mStatsManager.notifyNetworkStatus(getDefaultNetworks(),