| commit | b30ac0cdb19effdbcabc65b0286e06daa2ff7818 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Mon Nov 25 06:01:38 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 25 06:01:38 2024 +0000 |
| tree | 6aa45785611669b3d2d344e67e852ead3c356869 | |
| parent | c0fae9b1a748394735e124838429dec9761e25cf [diff] | |
| parent | b028a6f2647cbf17a35bc141d30be065e089234f [diff] |
Merge "Fix setup on devices without printflags" into main am: b028a6f264 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3368263 Change-Id: Iadda501f055c1f3001d2d732efbc7b4ecbae1a22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/app/connectivitychecker/src/com/android/testutils/connectivitypreparer/CarrierConfigSetupTest.kt b/staticlibs/testutils/app/connectivitychecker/src/com/android/testutils/connectivitypreparer/CarrierConfigSetupTest.kt index 46e511e..78b34a8 100644 --- a/staticlibs/testutils/app/connectivitychecker/src/com/android/testutils/connectivitypreparer/CarrierConfigSetupTest.kt +++ b/staticlibs/testutils/app/connectivitychecker/src/com/android/testutils/connectivitypreparer/CarrierConfigSetupTest.kt
@@ -123,7 +123,13 @@ """telephony/com\.android\.internal\.telephony\.flags\.force_iwlan_mms:""" + """.*ENABLED \(system\)""") ParcelFileDescriptor.AutoCloseInputStream( - uiAutomation.executeShellCommand("printflags")).bufferedReader().use { reader -> + // If the command fails (for example if printflags is missing) this will return false + // and the IWLAN disable will be skipped, which should be fine at it only helps with + // flakiness. + // This uses "sh -c" to cover that case as if "printflags" is used directly and the + // binary is missing, the remote end will crash and the InputStream EOF is never + // reached, so the read would hang. + uiAutomation.executeShellCommand("sh -c printflags")).bufferedReader().use { reader -> return reader.lines().anyMatch { it.contains(flagEnabledRegex) }