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

Commit 3d3308d3 authored by Felipe Leme's avatar Felipe Leme
Browse files

Moar test cases for NetworkPolicyManagerServiceTest. 

Before refactoring restrict-background into a UID policy, it's important
to make sure apps receive the proper ACTION_RESTRICT_BACKGROUND_CHANGED
intents.

BUG: 28791717

Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.NetworkPolicyManagerServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Change-Id: I32b2e36750ce4640b57d9b1d29dc53ec641456fa
parent 34a752d4

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

+4 −3
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    public NetworkPolicyManagerService(Context context, IActivityManager activityManager,

            INetworkStatsService networkStats, INetworkManagementService networkManagement) {

        this(context, activityManager, networkStats, networkManagement,

                NtpTrustedTime.getInstance(context), getSystemDir(), false);

                AppGlobals.getPackageManager(), NtpTrustedTime.getInstance(context), getSystemDir(),

                false);

    }



    private static File getSystemDir() {
@@ -421,7 +422,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


    public NetworkPolicyManagerService(Context context, IActivityManager activityManager,

            INetworkStatsService networkStats, INetworkManagementService networkManagement,

            TrustedTime time, File systemDir, boolean suppressDefaultPolicy) {

            IPackageManager pm, TrustedTime time, File systemDir, boolean suppressDefaultPolicy) {

        mContext = checkNotNull(context, "missing context");

        mActivityManager = checkNotNull(activityManager, "missing activityManager");

        mNetworkStats = checkNotNull(networkStats, "missing networkStats");
@@ -430,7 +431,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                Context.DEVICE_IDLE_CONTROLLER));

        mTime = checkNotNull(time, "missing TrustedTime");

        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        mIPm = AppGlobals.getPackageManager();

        mIPm = pm;



        HandlerThread thread = new HandlerThread(TAG);

        thread.start();

services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/restrict-background-on.xml

0 → 100644
+3 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<policy-list version="10" restrictBackground="true" >

</policy-list>

services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/uidA-blacklisted-restrict-background-off.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<policy-list version="10" restrictBackground="false">

  <uid-policy uid="10004" policy="1" />

</policy-list>

services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/uidA-blacklisted-restrict-background-on.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<policy-list version="10" restrictBackground="true">

  <uid-policy uid="10004" policy="1" />

</policy-list>

services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/uidA-whitelisted-restrict-background-off.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<policy-list version="10" restrictBackground="false">

  <uid-policy uid="10004" policy="4" />

</policy-list>