diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-05 21:46:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-05 21:46:55 +0000 |
| commit | abc774e093e58350a75bc658edaab33507d9d747 (patch) | |
| tree | 259a779cd1945edc95f0070fdf2b5ce2fd5058de | |
| parent | 95bbd81249f53982073cd2b92e7be3689abfd95b (diff) | |
| parent | f0082bb7670d1d62b89e2a45666e58b0b46c60c9 (diff) | |
| download | Connectivity-android14-tests-release.tar.gz | |
Snap for 11532599 from f0082bb7670d1d62b89e2a45666e58b0b46c60c9 to android14-tests-releaseandroid14-tests-release
Change-Id: I7387cf279d2286652b674c1deca83528fd95c937
| -rw-r--r-- | tests/cts/hostside/AndroidTest.xml | 1 | ||||
| -rw-r--r-- | tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/cts/hostside/AndroidTest.xml b/tests/cts/hostside/AndroidTest.xml index 90b7875894..0ffe81eb53 100644 --- a/tests/cts/hostside/AndroidTest.xml +++ b/tests/cts/hostside/AndroidTest.xml @@ -36,6 +36,7 @@ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup"> <option name="force-skip-system-props" value="true" /> <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" /> + <option name="set-global-setting" key="low_power_standby_enabled" value="0" /> </target_preparer> <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" > diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 4451a88efb..a4a8216c4a 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -799,7 +799,9 @@ public class ConnectivityManagerTest { assertNull(redactedNormal.getUids()); assertNull(redactedNormal.getSsid()); assertNull(redactedNormal.getUnderlyingNetworks()); - assertEquals(0, redactedNormal.getSubscriptionIds().size()); + // TODO: Make subIds public and update to verify the size is 2 + final int subIdsSize = redactedNormal.getSubscriptionIds().size(); + assertTrue(subIdsSize == 0 || subIdsSize == 2); assertEquals(WifiInfo.DEFAULT_MAC_ADDRESS, ((WifiInfo) redactedNormal.getTransportInfo()).getBSSID()); assertEquals(rssi, ((WifiInfo) redactedNormal.getTransportInfo()).getRssi()); |