diff options
| -rw-r--r-- | hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java | 3 | ||||
| -rw-r--r-- | tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt | 54 |
2 files changed, 29 insertions, 28 deletions
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java index 0ccc450f665..e550db6ec92 100644 --- a/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java +++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java @@ -52,7 +52,8 @@ public class AppOpsTests extends DeviceTestCase implements IBuildReceiver { final int APP_OP_RECORD_AUDIO = 27; final int APP_OP_RECORD_AUDIO_HOTWORD = 102; - TRANSFORMED_FROM_OP.put(APP_OP_RECORD_AUDIO, APP_OP_RECORD_AUDIO_HOTWORD); + // Temporarily commented out until the Trusted Hotword requirement is enforced again. +// TRANSFORMED_FROM_OP.put(APP_OP_RECORD_AUDIO, APP_OP_RECORD_AUDIO_HOTWORD); } private IBuildInfo mCtsBuild; diff --git a/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt b/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt index 8bd51cc228e..a73035e51a9 100644 --- a/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt +++ b/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt @@ -32,14 +32,9 @@ import android.support.test.uiautomator.UiDevice import android.support.test.uiautomator.UiSelector import androidx.test.platform.app.InstrumentationRegistry import com.android.compatibility.common.util.DisableAnimationRule -import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity -import com.android.compatibility.common.util.SystemUtil.eventually -import com.android.compatibility.common.util.SystemUtil.runShellCommand -import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity +import com.android.compatibility.common.util.SystemUtil.* import org.junit.After -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertTrue +import org.junit.Assert.* import org.junit.Assume.assumeFalse import org.junit.Assume.assumeTrue import org.junit.Before @@ -174,10 +169,8 @@ class CameraMicIndicatorsPermissionTest { } else if (packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { assertCarIndicatorsShown(useMic, useCamera) } else { - // Hotword gets remapped to RECORD_AUDIO on handheld, so handheld should show a mic - // indicator uiDevice.openQuickSettings() - assertPrivacyChipAndIndicatorsPresent(useMic || useHotword, useCamera) + assertPrivacyChipAndIndicatorsPresent(useMic, useCamera) } } @@ -201,22 +194,12 @@ class CameraMicIndicatorsPermissionTest { private fun assertCarIndicatorsShown(useMic: Boolean, useCamera: Boolean) { // Ensure the privacy chip is present (or not) - var chipFound = false - try { - eventually { - val privacyChip = uiDevice.findObject(By.res(PRIVACY_CHIP_ID)) - assertNotNull("view with id $PRIVACY_CHIP_ID not found", privacyChip) - privacyChip.click() - chipFound = true - } - } catch (e: Exception) { - // Handle more gracefully below - } - + val chipFound = isChipPresent() if (useMic || useCamera) { assertTrue("Did not find chip", chipFound) } else { assertFalse("Found chip, but did not expect to", chipFound) + return } eventually { @@ -233,11 +216,13 @@ class CameraMicIndicatorsPermissionTest { } private fun assertPrivacyChipAndIndicatorsPresent(useMic: Boolean, useCamera: Boolean) { - // Ensure the privacy chip is present - eventually { - val privacyChip = uiDevice.findObject(UiSelector().resourceId(PRIVACY_CHIP_ID)) - assertTrue("view with id $PRIVACY_CHIP_ID not found", privacyChip.exists()) - privacyChip.click() + // Ensure the privacy chip is present (or not) + val chipFound = isChipPresent() + if (useMic || useCamera) { + assertTrue("Did not find chip", chipFound) + } else { + assertFalse("Found chip, but did not expect to", chipFound) + return } eventually { @@ -254,6 +239,21 @@ class CameraMicIndicatorsPermissionTest { } } + private fun isChipPresent(): Boolean { + var chipFound = false + try { + eventually { + val privacyChip = uiDevice.findObject(By.res(PRIVACY_CHIP_ID)) + assertNotNull("view with id $PRIVACY_CHIP_ID not found", privacyChip) + privacyChip.click() + chipFound = true + } + } catch (e: Exception) { + // Handle more gracefully after + } + return chipFound + } + private fun pressBack() { uiDevice.pressBack() waitForIdle() |