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

am d808bd6e: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1

Browse Source 
* commit 'd808bd6e22547c144c6384c2bc6490853108ded6':
  Avoid NPE when missing network stats.
This commit is contained in:
Jeff Sharkey
2011-12-12 20:23:47 -08:00
committed by Android Git Automerger
parent 36ff7058f6 d808bd6e22
commit c431e2b9b5
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 // clear UID from current stats snapshot
mLastPollUidSnapshot = mLastPollUidSnapshot.withoutUid(uid); if (mLastPollUidSnapshot != null) {
mLastPollNetworkXtSnapshot = computeNetworkXtSnapshotFromUid(mLastPollUidSnapshot); mLastPollUidSnapshot = mLastPollUidSnapshot.withoutUid(uid);
mLastPollNetworkXtSnapshot = computeNetworkXtSnapshotFromUid(mLastPollUidSnapshot);
}
// clear kernel stats associated with UID // clear kernel stats associated with UID
resetKernelUidStats(uid); resetKernelUidStats(uid);