diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-12-12 20:23:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 20:23:47 -0800 |
| commit | 4dbfa44a2164724914b451ab1d6d0af8c0e9d1be (patch) | |
| tree | db0401628b3518e6d47f03fb2f178accaabf2f5b /services | |
| parent | 12d4b3cb96dd7ceb9e2f742898fc6bcc263a8011 (diff) | |
| parent | f0213bf1833e49744b29be97e44c3e9eaad9449d (diff) | |
| download | frameworks_base-4dbfa44a2164724914b451ab1d6d0af8c0e9d1be.zip frameworks_base-4dbfa44a2164724914b451ab1d6d0af8c0e9d1be.tar.gz frameworks_base-4dbfa44a2164724914b451ab1d6d0af8c0e9d1be.tar.bz2 | |
am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit 'f0213bf1833e49744b29be97e44c3e9eaad9449d':
Avoid NPE when missing network stats.
Diffstat (limited to 'services')
| -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 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 @@ 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); |