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

Commit e4b703b7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am fb0caad4: Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev 

* commit 'fb0caad4':
  Ack, wrap advisePersistThreshold() in lock.
parents 5d13e8ef fb0caad4

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

+6 −4
Original line number Diff line number Diff line
@@ -616,10 +616,12 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        // persist if beyond new thresholds

        final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis()

                : System.currentTimeMillis();

        synchronized (mStatsLock) {

            mDevRecorder.maybePersistLocked(currentTime);

            mXtRecorder.maybePersistLocked(currentTime);

            mUidRecorder.maybePersistLocked(currentTime);

            mUidTagRecorder.maybePersistLocked(currentTime);

        }



        // re-arm global alert

        registerGlobalAlert();