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

Merge "Avoid clobbering UID stats when not yet loaded."

Browse Source
This commit is contained in:
Jeff Sharkey
2011-06-17 11:28:31 -07:00
committed by Android (Google) Code Review
parent 395eef3bb6 af8339374f
commit 5bfa752f71
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mContext.unregisterReceiver(mShutdownReceiver);
writeNetworkStatsLocked();
writeUidStatsLocked();
if (mUidStatsLoaded) {
writeUidStatsLocked();
}
mNetworkStats.clear();
mUidStats.clear();
mUidStatsLoaded = false;
@@ -442,7 +444,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
if (persistDelta.rx[index] > persistThreshold
|| persistDelta.tx[index] > persistThreshold) {
writeNetworkStatsLocked();
writeUidStatsLocked();
if (mUidStatsLoaded) {
writeUidStatsLocked();
}
mLastNetworkPersist = networkStats;
break;
}