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

Commit 1cc6c9d2 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Use public API Network#getNetId() to get netid" am: 0292235a am: 9943270a am: ec4788f8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9a1e4f225064585448ee66c58a7afb9095ee7e4
parents 622d24f0 ec4788f8

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
    private final NetworkCallback mNetworkCallback = new NetworkCallback() {

        @Override

        public void onAvailable(Network network) {

            if (DEBUG) Log.d(TAG, "onAvailable " + network.netId);

            if (DEBUG) Log.d(TAG, "onAvailable " + network.getNetId());

            updateState();

            fireCallbacks();

        };
@@ -448,7 +448,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
        // how long the VPN connection is held on to.

        @Override

        public void onLost(Network network) {

            if (DEBUG) Log.d(TAG, "onLost " + network.netId);

            if (DEBUG) Log.d(TAG, "onLost " + network.getNetId());

            updateState();

            fireCallbacks();

        };

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+4 −2
Original line number Diff line number Diff line
@@ -3759,13 +3759,15 @@ public class StatsPullAtomService extends SystemService { 
            ConnectivityManager.NetworkCallback {

        @Override

        public void onAvailable(Network network) {

            FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,

            FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED,

                    network.getNetId(),

                    FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED__STATE__CONNECTED);

        }



        @Override

        public void onLost(Network network) {

            FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,

            FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED,

                    network.getNetId(),

                    FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED__STATE__DISCONNECTED);

        }

    }