diff options
| author | 2024-12-24 19:55:43 -0800 | |
|---|---|---|
| committer | 2024-12-24 19:55:43 -0800 | |
| commit | d24c77d2ca6b5197235974eaaf9d8ba05b2aa219 (patch) | |
| tree | 46b00092168188fcd5f1a5dabca36a0e19a87733 | |
| parent | be2b17a007f054a4a9a217404460e324d9b2639e (diff) | |
| parent | b717f38f1645635271d2c5d4b277ff787425e56d (diff) | |
Skip CameraMicIndicatorsPermissionTest for secondary_user_on_secondary_display am: b97cccb5e8 am: b717f38f16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3426695
Change-Id: Ie183b748c5c55f2f65d4730242cd174e61272b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt index e3197599c..b9d1cb305 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt @@ -56,6 +56,7 @@ import com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity import com.android.compatibility.common.util.UiAutomatorUtils2 import com.android.compatibility.common.util.UiAutomatorUtils2.assertWithUiDump +import com.android.compatibility.common.util.UserHelper import com.android.modules.utils.build.SdkLevel import com.android.sts.common.util.StsExtraBusinessLogicTestCase import java.util.regex.Pattern @@ -161,6 +162,8 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { @Before fun setUp() { + // Camera and Mic are not supported for secondary user visible as a background user. + assumeFalse(isCar && UserHelper(context).isVisibleBackgroundUser()) runWithShellPermissionIdentity { screenTimeoutBeforeTest = Settings.System.getLong(context.contentResolver, Settings.System.SCREEN_OFF_TIMEOUT) @@ -209,6 +212,10 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { @After fun tearDown() { + // Camera and Mic are not supported for secondary user visible as a background user. + if (isCar && UserHelper(context).isVisibleBackgroundUser()) { + return + } uninstall() if (isCar) { // Deselect the indicator since it persists otherwise |