From 0e5e045ba7afd67494e64c5d9d577ed63a6c6c54 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 11 Dec 2020 19:23:28 +0900 Subject: [PATCH] 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 --- .../net/java/com/android/server/ConnectivityServiceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 7a1cb25b2d..585c68b7bd 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -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),