LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid updating network stats after shutdown.

Browse Source 
Bug: 6109476
Change-Id: I9a3a8b182c8fa56d83ddc755d204d5b267c9bc5d
This commit is contained in:
Jeff Sharkey
2012-03-06 19:59:57 -08:00
parent 30aab0989d
commit 0097f85348
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -212,6 +212,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private final HandlerThread mHandlerThread; private final HandlerThread mHandlerThread;
private final Handler mHandler; private final Handler mHandler;
private boolean mSystemReady;
public NetworkStatsService( public NetworkStatsService(
Context context, INetworkManagementService networkManager, IAlarmManager alarmManager) { Context context, INetworkManagementService networkManager, IAlarmManager alarmManager) {
this(context, networkManager, alarmManager, NtpTrustedTime.getInstance(context), this(context, networkManager, alarmManager, NtpTrustedTime.getInstance(context),
@@ -250,6 +252,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
public void systemReady() { public void systemReady() {
mSystemReady = true;
if (!isBandwidthControlEnabled()) { if (!isBandwidthControlEnabled()) {
Slog.w(TAG, "bandwidth controls disabled, unable to track stats"); Slog.w(TAG, "bandwidth controls disabled, unable to track stats");
return; return;
@@ -336,6 +340,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mUidTagRecorder = null; mUidTagRecorder = null;
mDevStatsCached = null; mDevStatsCached = null;
mSystemReady = false;
} }
private void maybeUpgradeLegacyStatsLocked() { private void maybeUpgradeLegacyStatsLocked() {
@@ -649,6 +655,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
* {@link NetworkIdentitySet}. * {@link NetworkIdentitySet}.
*/ */
private void updateIfacesLocked() { private void updateIfacesLocked() {
if (!mSystemReady) return;
if (LOGV) Slog.v(TAG, "updateIfacesLocked()"); if (LOGV) Slog.v(TAG, "updateIfacesLocked()");
// take one last stats snapshot before updating iface mapping. this // take one last stats snapshot before updating iface mapping. this
@@ -737,7 +744,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
* {@link NetworkStatsHistory}. * {@link NetworkStatsHistory}.
*/ */
private void performPollLocked(int flags) { private void performPollLocked(int flags) {
if (!mSystemReady) return;
if (LOGV) Slog.v(TAG, "performPollLocked(flags=0x" + Integer.toHexString(flags) + ")"); if (LOGV) Slog.v(TAG, "performPollLocked(flags=0x" + Integer.toHexString(flags) + ")");
final long startRealtime = SystemClock.elapsedRealtime(); final long startRealtime = SystemClock.elapsedRealtime();
final boolean persistNetwork = (flags & FLAG_PERSIST_NETWORK) != 0; final boolean persistNetwork = (flags & FLAG_PERSIST_NETWORK) != 0;