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

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

Merge "Revert "Enable default background network restrictions"" into main am: 095f7f73 

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



Change-Id: I5558f57e0fe96b63c5d75609dc7eb7a3cd683f19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90fe92db 095f7f73

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

+4 −1
Original line number Diff line number Diff line
@@ -340,6 +340,8 @@ 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.
@@ -1061,7 +1063,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                    }



                    // The flag is boot-stable.

                    mBackgroundNetworkRestricted = Flags.networkBlockedForTopSleepingAndAbove();

                    mBackgroundNetworkRestricted = ALWAYS_RESTRICT_BACKGROUND_NETWORK

                            && Flags.networkBlockedForTopSleepingAndAbove();

                    if (mBackgroundNetworkRestricted) {

                        // Firewall rules and UidBlockedState will get updated in

                        // updateRulesForGlobalChangeAL below.

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

+8 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 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;
@@ -2143,12 +2144,14 @@ 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 {
@@ -2178,6 +2181,7 @@ 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 {
@@ -2216,6 +2220,7 @@ 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 {
@@ -2245,6 +2250,7 @@ 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 testUidObserverFiltersProcStateChanges() throws Exception {
@@ -2307,6 +2313,7 @@ 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 {
@@ -2327,6 +2334,7 @@ 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 {