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

Commit 7b8042a3 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Enable default background network restrictions"" into main am: a77be890 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2976851



Change-Id: I21b3fdfd88bd168fd5a8a22b9f3d11fabaef09cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ce9b0f2 a77be890

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

+1 −4
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    static final String TAG = NetworkPolicyLogger.TAG;

    private static final boolean LOGD = NetworkPolicyLogger.LOGD;

    private static final boolean LOGV = NetworkPolicyLogger.LOGV;

    // TODO: b/304347838 - Remove once the feature is in staging.

    private static final boolean ALWAYS_RESTRICT_BACKGROUND_NETWORK = false;



    /**

     * No opportunistic quota could be calculated from user data plan or data settings.
@@ -1070,8 +1068,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                    }



                    // The flag is boot-stable.

                    mBackgroundNetworkRestricted = ALWAYS_RESTRICT_BACKGROUND_NETWORK

                            && Flags.networkBlockedForTopSleepingAndAbove();

                    mBackgroundNetworkRestricted = Flags.networkBlockedForTopSleepingAndAbove();

                    if (mBackgroundNetworkRestricted) {

                        // Firewall rules and UidBlockedState will get updated in

                        // updateRulesForGlobalChangeAL below.

services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java

+0 −8
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ import libcore.io.Streams; 
import org.junit.After;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.MethodRule;
@@ -2151,14 +2150,12 @@ public class NetworkPolicyManagerServiceTest { 
        assertFalse(mService.isUidNetworkingBlocked(UID_E, false));

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testBackgroundChainEnabled() throws Exception {

        verify(mNetworkManager).setFirewallChainEnabled(FIREWALL_CHAIN_BACKGROUND, true);

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testBackgroundChainOnProcStateChange() throws Exception {
@@ -2188,7 +2185,6 @@ public class NetworkPolicyManagerServiceTest { 
        assertTrue(mService.isUidNetworkingBlocked(UID_A, false));

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testBackgroundChainOnAllowlistChange() throws Exception {
@@ -2227,7 +2223,6 @@ public class NetworkPolicyManagerServiceTest { 
        assertFalse(mService.isUidNetworkingBlocked(UID_B, false));

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testBackgroundChainOnTempAllowlistChange() throws Exception {
@@ -2266,7 +2261,6 @@ public class NetworkPolicyManagerServiceTest { 
                && uidState.procState == procState && uidState.capability == capability;

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testUidObserverFiltersProcStateChanges() throws Exception {
@@ -2329,7 +2323,6 @@ public class NetworkPolicyManagerServiceTest { 
        waitForUidEventHandlerIdle();

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testUidObserverFiltersStaleChanges() throws Exception {
@@ -2350,7 +2343,6 @@ public class NetworkPolicyManagerServiceTest { 
        waitForUidEventHandlerIdle();

    }



    @Ignore("Temporarily disabled until the feature is enabled")

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE)

    public void testUidObserverFiltersCapabilityChanges() throws Exception {