Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06659047 authored by Ryuki Nakamura's avatar Ryuki Nakamura Committed by android-build-merger
Browse files

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

am: 900620cf

Change-Id: I730e7c550b88325a418c419340e6f98080f89969
parents 20fa635f 900620cf

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()