Merge "Update interface quota limit when network stats updated" am: bfc4589d46... (7603db47) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -1032,6 +1032,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		// READ_NETWORK_USAGE_HISTORY permission above.

		synchronized (mNetworkPoliciesSecondLock) {
		updateNetworkRulesNL();
		updateNetworkEnabledNL();
		updateNotificationsNL();
		}

+5 −2

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