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

Commit 6455e31b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Minor cleanups to NetworkStats interface tracking."

parents b376f022 2df4c7d7

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

+4 −1
Original line number Diff line number Diff line
@@ -5439,8 +5439,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
@@ -153,8 +153,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
    static final boolean LOGV = false;



    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;
@@ -1533,10 +1532,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;