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

Commit 1536fb6e authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Postpone updating the bw rules until NMS is ready. 

Change-Id: Idb1976942d6b6a7d99340c8edba52409342ff81a
Fixes: 110455216
Test: Verified that packages are still restricted after a reboot.
parent 8a962e56

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

+6 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


    private final CountDownLatch mAdminDataAvailableLatch = new CountDownLatch(1);



    private volatile boolean mNetworkManagerReady;



    /** Defined network policies. */

    @GuardedBy("mNetworkPoliciesSecondLock")

    final ArrayMap<NetworkTemplate, NetworkPolicy> mNetworkPolicy = new ArrayMap<>();
@@ -872,6 +874,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    }



    public CountDownLatch networkScoreAndNetworkManagementServiceReady() {

        mNetworkManagerReady = true;

        final CountDownLatch initCompleteSignal = new CountDownLatch(1);

        mHandler.post(() -> initService(initCompleteSignal));

        return initCompleteSignal;
@@ -5024,6 +5027,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


    private void handleRestrictedPackagesChangeUL(Set<Integer> oldRestrictedUids,

            Set<Integer> newRestrictedUids) {

        if (!mNetworkManagerReady) {

            return;

        }

        if (oldRestrictedUids == null) {

            for (int uid : newRestrictedUids) {

                updateRulesForDataUsageRestrictionsUL(uid);