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

Commit b372e3f2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update interface quota limit when network stats updated" am: bfc4589d am: a992b3aa 

Change-Id: I2eae931385e4d93aa9f19e216079685f0215374e
parents 68632fe7 a992b3aa

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

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



            synchronized (mNetworkPoliciesSecondLock) {

                updateNetworkRulesNL();

                updateNetworkEnabledNL();

                updateNotificationsNL();

            }

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

+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,