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

Commit 0a865ee0 authored by lucaslin's avatar lucaslin
Browse files

Use public API Network#getNetId() to get netid 

Network class will be a part of mainline module, external callers
cannot call its hidden constant. Use public API - getNetId() to
get netid instead.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I8d0924e4a1dab673a2693a8ae872d2e79e22cfe6
parent bff83898

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

+2 −2
Original line number Diff line number Diff line
@@ -386,7 +386,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();

        };
@@ -395,7 +395,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
@@ -3880,13 +3880,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);

        }

    }