diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-12-12 20:19:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-12 20:19:27 -0800 |
| commit | f0bbc494d638f4c77e688bf9410027f453301559 (patch) | |
| tree | c077c07bc7899cdf61b148602554bebd9d8326c2 | |
| parent | 840201d6e2d7d53e42a31ffeb2ef454982882d12 (diff) | |
| parent | d04ff11d6fa5eb26ca19ac9962b899d9fb0470f0 (diff) | |
| download | base-f0bbc494d638f4c77e688bf9410027f453301559.tar.gz | |
Merge "Avoid NPE when missing network stats." into ics-mr1
| -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); |