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

Commit c3369c58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a crash in eng builds" am: 0fc25a86 am: 4fb275ef am: ea91bdb3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00
parents 5cbcf761 ea91bdb3

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

+2 −2
Original line number Diff line number Diff line
@@ -4954,8 +4954,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),