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

Commit fb0ff9bb authored by Chalard Jean's avatar Chalard Jean
Browse files

Fix a crash in eng builds 

CAPTIVE_PORTAL is a CS-managed capability, and causes CS to log a wtf.
When this test is run on an eng build, this sends SIGSEGV to the test,
which is pretty difficult to debug.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I72fc46a6daa4e886425b4dc967318cca9f1a5302
parent 4f9abbfb

tests/net/java/com/android/server/ConnectivityServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -4910,8 +4910,8 @@ public class ConnectivityServiceTest { 
        expectForceUpdateIfaces(onlyCell, MOBILE_IFNAME);

        reset(mStatsService);



        // Captive portal change shouldn't update ifaces

        mCellNetworkAgent.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);

        // Temp metered change shouldn't update ifaces

        mCellNetworkAgent.addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);

        waitForIdle();

        verify(mStatsService, never())

                .forceUpdateIfaces(eq(onlyCell), any(NetworkState[].class), eq(MOBILE_IFNAME),