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

Commit 5b0434ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed tests that were wrongly merged."

parents c62122a7 c08ecdf3

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

+3 −3
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ public class NetworkPolicyManagerServiceTest { 
    }



    @Test

    @NetPolicyXml("uidA-blacklisted-restrict-background-off.xml")

    @NetPolicyXml("uidA-blacklisted-restrict-background-on.xml")

    public void testBlacklistedAppIsNotNotifiedWhenRestrictBackgroundIsOn() throws Exception {

        // Sanity checks.

        assertRestrictBackgroundOn();
@@ -478,10 +478,10 @@ public class NetworkPolicyManagerServiceTest { 
    }



    @Test

    @NetPolicyXml("uidA-whitelisted-restrict-background-off.xml")

    @NetPolicyXml("uidA-whitelisted-restrict-background-on.xml")

    public void testWhitelistedAppIsNotNotifiedWhenRestrictBackgroundIsOn() throws Exception {

        // Sanity checks.

        assertRestrictBackgroundOff();

        assertRestrictBackgroundOn();

        assertWhitelistUids(UID_A);



        final FutureIntent futureIntent = newRestrictBackgroundChangedFuture();