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

Commit 3261b948 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Postpone updating the bw rules until NMS is ready."

parents 4c436c0f 1536fb6e

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

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




    private final CountDownLatch mAdminDataAvailableLatch = new CountDownLatch(1);

    private final CountDownLatch mAdminDataAvailableLatch = new CountDownLatch(1);





    private volatile boolean mNetworkManagerReady;



    /** Defined network policies. */

    /** Defined network policies. */

    @GuardedBy("mNetworkPoliciesSecondLock")

    @GuardedBy("mNetworkPoliciesSecondLock")

    final ArrayMap<NetworkTemplate, NetworkPolicy> mNetworkPolicy = new ArrayMap<>();

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

    }





    public CountDownLatch networkScoreAndNetworkManagementServiceReady() {

    public CountDownLatch networkScoreAndNetworkManagementServiceReady() {

        mNetworkManagerReady = true;

        final CountDownLatch initCompleteSignal = new CountDownLatch(1);

        final CountDownLatch initCompleteSignal = new CountDownLatch(1);

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

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

        return initCompleteSignal;

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




    private void handleRestrictedPackagesChangeUL(Set<Integer> oldRestrictedUids,

    private void handleRestrictedPackagesChangeUL(Set<Integer> oldRestrictedUids,

            Set<Integer> newRestrictedUids) {

            Set<Integer> newRestrictedUids) {

        if (!mNetworkManagerReady) {

            return;

        }

        if (oldRestrictedUids == null) {

        if (oldRestrictedUids == null) {

            for (int uid : newRestrictedUids) {

            for (int uid : newRestrictedUids) {

                updateRulesForDataUsageRestrictionsUL(uid);

                updateRulesForDataUsageRestrictionsUL(uid);