diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-07 03:51:56 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-07 03:51:56 +0000 |
| commit | f0bf0127f41292e9e2c6e16b9ba5a858a9dcca87 (patch) | |
| tree | ee8d735fee120fbc1d214d26c017302aececad38 | |
| parent | 4080564cdb280b598af2f73d1b32b8e779350670 (diff) | |
| parent | 8646cddb50b70fa9f5148bbc9ab9b82f349e565a (diff) | |
| download | cts-aml_sta_341114000.tar.gz | |
Snap for 10772532 from 8646cddb50b70fa9f5148bbc9ab9b82f349e565a to mainline-os-statsd-releaseaml_sta_341114000aml_sta_341111000aml_net_341111030
Change-Id: Id916c5c46a2883ac089df097bfddaf5299ca055d
| -rw-r--r-- | tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java | 4 | ||||
| -rw-r--r-- | tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java index 51b8d7fcc44..7886fa26b2e 100644 --- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java +++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java @@ -5826,7 +5826,7 @@ public class TelephonyManagerTest { implements TelephonyCallback.ServiceStateListener, TelephonyCallback.RadioPowerStateListener { private static final long TIMEOUT_TO_WAIT_FOR_DESIRED_STATE = - TimeUnit.SECONDS.toMillis(15); + TimeUnit.SECONDS.toMillis(20); private final Object mPowerStateLock = new Object(); private final Object mServiceStateLock = new Object(); ServiceState mServiceState; @@ -5869,7 +5869,7 @@ public class TelephonyManagerTest { mDesireRadioPowerState = desiredRadioState; /** * Since SST sets waiting time up to 10 seconds for the power off radio, the - * RadioStateIntent timer extends the wait time up to 15 seconds here as well. + * RadioStateIntent timer extends the wait time up to 20 seconds here as well. */ waitForDesiredState(mPowerStateLock, desiredRadioState, () -> mRadioPowerState, true); diff --git a/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml b/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml index a1f5efd0b62..ec22a4c5ed2 100644 --- a/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml +++ b/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml @@ -161,5 +161,7 @@ <!-- b/296896687 --> <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ASurfaceControlTest#testSurfaceTransaction_setDesiredPresentTime_30ms" /> <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ASurfaceControlTest#testSurfaceTransaction_setDesiredPresentTime_100ms" /> + <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ASurfaceControlTest#testSurfaceTransaction_setFrameTimeline_preferredIndex" /> + <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ASurfaceControlTest#testSurfaceTransaction_setFrameTimeline_notPreferredIndex" /> </configuration> |