commit 48be310e69ddd9598d5d7235d1690ab789ec7f6f
author Ryuki Nakamura <ryuki.x.nakamura@sonymobile.com> Mon Mar 20 17:24:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 20 17:24:37 2017 +0000
tree cb7da54249c39b7a175ea13d6f305c775d403e97
parent 7c8e0918a191fc129c821e4769d9338ad3915908
parent 06659047f0479505618c1a85dfcfb46b750014ef

Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am: a6ce3f3021 am: 900620cffc
am: 06659047f0

Change-Id: Ia7c8309f68d85a88e2a26169509d3e45d4d2ff69

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

diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index 104c296..6d666e8 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -384,6 +384,7 @@
         mContext.unregisterReceiver(mTetherReceiver);
         mContext.unregisterReceiver(mPollReceiver);
         mContext.unregisterReceiver(mRemovedReceiver);
+        mContext.unregisterReceiver(mUserReceiver);
         mContext.unregisterReceiver(mShutdownReceiver);
 
         final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis()