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

Merge "Avoid NPE when missing network stats." into ics-mr1

Browse Source
This commit is contained in:
Jeff Sharkey
2011-12-12 20:19:27 -08:00
committed by Android (Google) Code Review
parent 840201d6e2 d04ff11d6f
commit f0bbc494d6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1060,8 +1060,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
}
// clear UID from current stats snapshot
mLastPollUidSnapshot = mLastPollUidSnapshot.withoutUid(uid);
mLastPollNetworkXtSnapshot = computeNetworkXtSnapshotFromUid(mLastPollUidSnapshot);
if (mLastPollUidSnapshot != null) {
mLastPollUidSnapshot = mLastPollUidSnapshot.withoutUid(uid);
mLastPollNetworkXtSnapshot = computeNetworkXtSnapshotFromUid(mLastPollUidSnapshot);
}
// clear kernel stats associated with UID
resetKernelUidStats(uid);