Commit a47b0c97 authored Mar 01, 2017 by Ryuki Nakamura Committed by Shunta Sato Mar 07, 2017

Fix NPE while performing NetworkStatsService.removeUidsLocked()

Symptom:
NPE occurred while performing NetworkStatsService.removeUidsLocked().

Root cause:
NetworkStatsService refers to mUidRecorder at
NetworkStatsService.removeUidsLocked() when mUserReceiver received
Intent.ACTION_USER_REMOVED.
However NetworkStatsService sets mUidRecorder to null without
unregistering mUserReceiver when mShutdownReceiver received
Intent.ACTION_SHUTDOWN.
Therefore NPE occurred when mUserReceiver received
Intent.ACTION_USER_REMOVED after mShutdownReceiver received
Intent.ACTION_SHUTDOWN.

Solution:
Unregister mUserReceiver before setting mUidRecorder to null when
mShutdownReceiver received Intent.ACTION_SHUTDOWN.

Bug: 36015339

Change-Id: I9279e4c6ae07d94e7ec519c40b2d973c84d8fef1

parent 9324d651

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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()