Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am: a6ce3f3021

am: 900620cffc Change-Id: I730e7c550b88325a418c419340e6f98080f89969
2017-03-20 17:12:39 +00:00
parent 20fa635f7b 900620cffc
commit 06659047f0
1 changed files with 1 additions and 0 deletions
--- 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()