commit c70383c5b6917a11f11a9244dd3cd403c0a0950a
author The Android Automerger <android-build@android.com> Mon Dec 12 22:08:59 2011 -0800
committer The Android Automerger <android-build@android.com> Mon Dec 12 22:08:59 2011 -0800
tree 0cfdd626a39c21fd4940c7f5524a202ec92ab21a
parent 3511b086bc35ad44d81828e7a8e7432bd7193c58
parent aef9d1ad9cb706558f352f983bf9c548bfc97fb9

merge in ics-mr1-release history after reset to ics-mr1

services/java/com/android/server/net/NetworkStatsService.java

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index 871ed68..f660520 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -1060,8 +1060,10 @@
         }
 
         // 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);