summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ryuki Nakamura <ryuki.x.nakamura@sonymobile.com> 2017-03-20 17:05:16 +0000
committer android-build-merger <android-build-merger@google.com> 2017-03-20 17:05:16 +0000
commit900620cffcb477e6a958bedf329b048290282e16 (patch)
treee737e00d8e4757829c66d4aa33a7afd4040f4df2
parent088df2bd0afe17f3f33e3c89a7bff0d114bdaf7c (diff)
parenta6ce3f3021d9d480e4131335ff11fd74714a1559 (diff)
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
am: a6ce3f3021 Change-Id: I3f43b25622e5052e6336983da84b92e12f3e06dc
-rw-r--r--services/core/java/com/android/server/net/NetworkStatsService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index 4658c0463f0e..060dd73d11c8 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -381,6 +381,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mContext.unregisterReceiver(mTetherReceiver);
mContext.unregisterReceiver(mPollReceiver);
mContext.unregisterReceiver(mRemovedReceiver);
+ mContext.unregisterReceiver(mUserReceiver);
mContext.unregisterReceiver(mShutdownReceiver);
final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis()