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

Change-Id: I2eae931385e4d93aa9f19e216079685f0215374e
2019-12-19 10:20:59 +00:00
parent e58fff9f29 2dcf4c0227
commit 661741804d
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,8 +888,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
            mUidTagRecorder.maybePersistLocked(currentTime);
        }

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

    @Override