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

Commit dee7e2ac authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Fix test breakage."

parents f7f4c206 4b63d697

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

+9 −9
Original line number Diff line number Diff line
@@ -242,13 +242,13 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 


    @Suppress

    public void testPolicyChangeTriggersBroadcast() throws Exception {

        mService.setUidPolicy(UID_A, POLICY_NONE);

        mService.setAppPolicy(UID_A, POLICY_NONE);



        // change background policy and expect broadcast

        final Future<Intent> backgroundChanged = mServiceContext.nextBroadcastIntent(

                ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED);



        mService.setUidPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        mService.setAppPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);



        backgroundChanged.get();

    }
@@ -316,7 +316,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        expectSetUidForeground(UID_A, true);

        future = expectRulesChanged(UID_A, RULE_ALLOW_ALL);

        replay();

        mService.setUidPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        mService.setAppPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        future.get();

        verifyAndReset();
@@ -357,7 +357,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        expectSetUidForeground(UID_A, true);

        future = expectRulesChanged(UID_A, RULE_ALLOW_ALL);

        replay();

        mService.setUidPolicy(UID_A, POLICY_NONE);

        mService.setAppPolicy(UID_A, POLICY_NONE);

        future.get();

        verifyAndReset();
@@ -379,7 +379,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        expectSetUidForeground(UID_A, false);

        future = expectRulesChanged(UID_A, RULE_REJECT_METERED);

        replay();

        mService.setUidPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        mService.setAppPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        future.get();

        verifyAndReset();
@@ -411,7 +411,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        future = expectRulesChanged(UID_A, RULE_ALLOW_ALL);

        replay();

        mProcessObserver.onForegroundActivitiesChanged(PID_1, UID_A, false);

        mService.setUidPolicy(UID_A, POLICY_NONE);

        mService.setAppPolicy(UID_A, POLICY_NONE);

        future.get();

        verifyAndReset();
@@ -420,7 +420,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        expectSetUidForeground(UID_A, false);

        future = expectRulesChanged(UID_A, RULE_REJECT_METERED);

        replay();

        mService.setUidPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        mService.setAppPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        future.get();

        verifyAndReset();
@@ -429,7 +429,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        expectSetUidForeground(UID_A, false);

        future = expectRulesChanged(UID_A, RULE_ALLOW_ALL);

        replay();

        mService.setUidPolicy(UID_A, POLICY_NONE);

        mService.setAppPolicy(UID_A, POLICY_NONE);

        future.get();

        verifyAndReset();

    }
@@ -605,7 +605,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        expectSetUidForeground(UID_A, false);

        future = expectRulesChanged(UID_A, RULE_REJECT_METERED);

        replay();

        mService.setUidPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        mService.setAppPolicy(UID_A, POLICY_REJECT_METERED_BACKGROUND);

        future.get();

        verifyAndReset();