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

Commit 43af70dd authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Merge "Minor cleanups to NetworkStats interface tracking." am:... 

Merge "Merge "Minor cleanups to NetworkStats interface tracking." am: 6455e31b am: 65777e4b" into pi-dev-plus-aosp
am: 9d9c8840

Change-Id: I37dcab7f7e915d27b87291120a198dbcf1421f8f
parents 0fcc92a9 9d9c8840

services/core/java/com/android/server/ConnectivityService.java

+4 −1
Original line number Diff line number Diff line
@@ -5484,8 +5484,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        if (!networkAgent.everConnected && state == NetworkInfo.State.CONNECTED) {

            networkAgent.everConnected = true;



            if (networkAgent.linkProperties == null) {

                Slog.wtf(TAG, networkAgent.name() + " connected with null LinkProperties");

            }



            updateLinkProperties(networkAgent, null);

            notifyIfacesChangedForNetworkStats();



            networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);

            scheduleUnvalidatedPrompt(networkAgent);

services/core/java/com/android/server/net/NetworkStatsService.java

+1 −6
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
    static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);



    private static final int MSG_PERFORM_POLL = 1;

    private static final int MSG_UPDATE_IFACES = 2;

    private static final int MSG_REGISTER_GLOBAL_ALERT = 3;

    private static final int MSG_REGISTER_GLOBAL_ALERT = 2;



    /** Flags to control detail level of poll event. */

    private static final int FLAG_PERSIST_NETWORK = 0x1;
@@ -1569,10 +1568,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
                    mService.performPoll(flags);

                    return true;

                }

                case MSG_UPDATE_IFACES: {

                    mService.updateIfaces(null);

                    return true;

                }

                case MSG_REGISTER_GLOBAL_ALERT: {

                    mService.registerGlobalAlert();

                    return true;