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

Commit 006d5182 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Fix flaky override unmetered/congested test"

parents ae5bbc98 6c97c0f3

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+4 −0
Original line number Diff line number Diff line
@@ -789,12 +789,14 @@ public class DataConnectionTest extends TelephonyTest { 
        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onMeterednessChanged(true);

        waitForMs(100);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));

        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onMeterednessChanged(false);

        waitForMs(100);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));
@@ -813,12 +815,14 @@ public class DataConnectionTest extends TelephonyTest { 
        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onCongestednessChanged(true);

        waitForMs(100);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));

        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));



        mDc.onCongestednessChanged(false);

        waitForMs(100);



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));

        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));