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

Commit 7f957ec1 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Fix transitioning between non-accept strict policies." am: bef2c91b... 

Merge "Fix transitioning between non-accept strict policies." am: bef2c91b am: 345a2f98 am: dc46874c am: 28f7ed5d
am: 3a182d1b

Change-Id: I4dcabcef1b4043b1edc8d07e03c25da2681c25c3
parents bbc3f863 3a182d1b

services/core/java/com/android/server/NetworkManagementService.java

+4 −2
Original line number Diff line number Diff line
@@ -1838,13 +1838,15 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
            // netd does not keep state on strict mode policies, and cannot replace a non-accept

            // policy without deleting it first. Rather than add state to netd, just always send

            // it an accept policy when switching between two non-accept policies.

            // TODO: consider keeping state in netd so we can simplify this code.

            if (oldPolicy != StrictMode.NETWORK_POLICY_ACCEPT &&

                    policy != StrictMode.NETWORK_POLICY_ACCEPT) {

                applyUidCleartextNetworkPolicy(uid, policy);

            }

                applyUidCleartextNetworkPolicy(uid, StrictMode.NETWORK_POLICY_ACCEPT);

            }



            applyUidCleartextNetworkPolicy(uid, policy);

        }

    }



    @Override

    public boolean isBandwidthControlEnabled() {