Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Minor cleanups to NetworkStats interface tracking." am: 6455e31b76 am: 65777e4b61" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-03-06 07:47:34 +00:00
committed by Android (Google) Code Review
parent a60edc8df4 9ea7a8bfb0
commit 9d9c884031
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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);

7
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -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;