Merge "Update interface quota limit when network stats updated" am: 2dcf4c0227 am: a992b3aa83 am: 661741804d

Change-Id: I118f05adf0d5fc4aa665d45b3896d898dfeb3924
2019-12-19 10:37:39 +00:00
parent c6dee71164 661741804d
commit a8ebc95eb4
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -873,6 +873,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
                    + mPersistThreshold);
        }

+        final long oldGlobalAlertBytes = mGlobalAlertBytes;
+
        // update and persist if beyond new thresholds
        final long currentTime = mClock.millis();
        synchronized (mStatsLock) {
@@ -886,9 +888,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
            mUidTagRecorder.maybePersistLocked(currentTime);
        }

-        // re-arm global alert
+        if (oldGlobalAlertBytes != mGlobalAlertBytes) {
            registerGlobalAlert();
        }
+    }

    @Override
    public DataUsageRequest registerUsageCallback(String callingPackage,