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

Commit 2df4c7d7 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Minor cleanups to NetworkStats interface tracking. 

Currently, when a network goes into CONNECTED state, we call
updateLinkProperties and then notifyIfacesChangedForNetworkStats.
The latter is unnecessary, as there are exactly two cases:

1. networkAgent.linkProperties != null: updateLinkProperties will
   call notifyIfacesChangedForNetworkStats, because oldLp is null
   and networkAgent.linkProperties is not null.
2. networkAgent.linkProperties is null: there is no need to call
   notifyIfacesChangedForNetworkStats, because no interfaces were
   added or removed. When they are, updateLinkProperties will be
   called again.

Removing the call to notifyIfacesChangedForNetworkStats avoids
a stats poll, which is a minor performance improvement.

Also, remove the NetworkStatsService code to do asynchronous
interface updates, since it has no callers.

Bug: 72107146
Test: builds, boots
Test: runtest frameworks-net
Change-Id: I9337ea26c0505a1c66ceda01254b68e25cd7972c
parent 1451124f

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;