summaryrefslogtreecommitdiff
path: root/tests/cts
diff options
context:
space:
mode:
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-04-12 12:48:05 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-04-12 12:48:05 -0700
commitb666d39bed82438b45f31e1293b33bc641cab5b3 (patch)
treef156135781aea61e183bce74793ceb7362b38aa0 /tests/cts
parente144636772e214d156613381cf597861eb420a4b (diff)
parent8be8eb312f4b1773de0573bc3f8551735e2689db (diff)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/33001801', 'googleplex-android-review.googlesource.com/32955270', 'googleplex-android-review.googlesource.com/32955271', 'googleplex-android-review.googlesource.com/32955655'] into 25Q2-release.
Change-Id: I088ab7753b2380ccaf27e13bf9a51d9663118d8b
Diffstat (limited to 'tests/cts')
-rw-r--r--tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt
index 3948e984f..28f8bc687 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt
@@ -63,7 +63,8 @@ class PermissionUpgradeTest : BaseUsePermissionTest() {
android.Manifest.permission.USE_SIP,
android.Manifest.permission.PROCESS_OUTGOING_CALLS,
android.Manifest.permission.CAMERA,
- android.Manifest.permission.BODY_SENSORS,
+ // TODO: b/406669065 - Re-enable this permission once upgrade logic is fixed.
+ // android.Manifest.permission.BODY_SENSORS,
// Split permissions
android.Manifest.permission.ACCESS_BACKGROUND_LOCATION
)