diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-14 06:39:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 06:39:50 +0000 |
| commit | c3369c58ac3a611fda910998a042ce2ebcb55dca (patch) | |
| tree | 99185dc78767080bd273919f9a51231fef4dd9fa /tests/net/java/com/android/server | |
| parent | 5cbcf7619fac4f87d8738e7067e484acdae9b4a2 (diff) | |
| parent | ea91bdb31eb8e6c09559f174ca983d9097c8a929 (diff) | |
Merge "Fix a crash in eng builds" am: 0fc25a8693 am: 4fb275ef08 am: ea91bdb31e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00
Diffstat (limited to 'tests/net/java/com/android/server')
| -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 6cd08c30bced..1e1d9da53371 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -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), |