diff options
author | Jeff Sharkey <jsharkey@android.com> | 2011-12-12 18:51:26 -0800 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2011-12-12 18:51:26 -0800 |
commit | d04ff11d6fa5eb26ca19ac9962b899d9fb0470f0 (patch) | |
tree | c7fc853d82ba14c388d4f1c2ff369b2057446c50 | |
parent | 359bb3b432b21590c12588c3ca3880ac17aadc96 (diff) | |
download | base-d04ff11d6fa5eb26ca19ac9962b899d9fb0470f0.tar.gz |
Avoid NPE when missing network stats.
Bug: 5750339
Change-Id: I4b739dbd076b270a5a2b2e2a1e0f6e445d8c124e
-rw-r--r-- | services/java/com/android/server/net/NetworkStatsService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java index 871ed682e629..f6605203f598 100644 --- a/services/java/com/android/server/net/NetworkStatsService.java +++ b/services/java/com/android/server/net/NetworkStatsService.java @@ -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); |