commit d808bd6e22547c144c6384c2bc6490853108ded6
author Jeff Sharkey <jsharkey@android.com> Mon Dec 12 20:21:34 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 12 20:21:34 2011 -0800
tree 0cfdd626a39c21fd4940c7f5524a202ec92ab21a
parent aef9d1ad9cb706558f352f983bf9c548bfc97fb9
parent 3511b086bc35ad44d81828e7a8e7432bd7193c58

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

* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.

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);