commit 6dbd8585dcfea85a7657b429a3573d8668f4d00b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 14 05:17:15 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 14 05:17:15 2020 +0000
tree 71ce01ba5304d43e37cc54c7e1b55235d3a24794
parent 0079fa9b39471b82127ecbd6d622660418302601
parent 0e5e045ba7afd67494e64c5d9d577ed63a6c6c54

Merge "Fix a crash in eng builds"

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

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index e8367ad..960b6c2 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -4954,8 +4954,8 @@
         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),