diff options
| author | Chalard Jean <jchalard@google.com> | 2020-12-11 19:23:28 +0900 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2020-12-13 23:02:08 +0900 |
| commit | fb0ff9bbcf45a1b2609262d4e72bd0cd0a820d08 (patch) | |
| tree | f83380d23bcaad23e0c2d08581e84e5ff3ab250f /tests/net/java | |
| parent | 4f9abbfb58813534c8c6e122db04f7aa10ee0e9f (diff) | |
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
Diffstat (limited to 'tests/net/java')
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 4 |
1 files 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 7a1cb25b2d3a..585c68b7bd2a 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), |