commit fd6db90f998351ae7896543bc08d730ecbbc4f12
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 16 09:11:45 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 16 09:11:45 2025 -0700
tree 106cef6d06101a41069ce6f030f3e4d074da4c08
parent 9d8d44b3493c948a8279b21b8645f6719603b63b
parent 4ad6c9f031d45de07be815bf1e993dc502034466

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33080947'] into 25Q2-release.

Change-Id: I323e1d14aba56c2cf1b04e730f6f3231a06c8dd7

tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt

diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt
index 28f8bc6..0067e6d 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt
@@ -142,7 +142,8 @@
                 android.Manifest.permission.ACCESS_FINE_LOCATION,
                 android.Manifest.permission.ACCESS_COARSE_LOCATION,
                 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,
                 android.Manifest.permission.READ_CELL_BROADCASTS,
                 // Split permissions
                 android.Manifest.permission.ACCESS_BACKGROUND_LOCATION,