diff options
| author | 2024-12-13 01:46:43 -0800 | |
|---|---|---|
| committer | 2024-12-13 01:46:43 -0800 | |
| commit | 41f24eeb03704d2a2d654422f6e2b3c173a171c7 (patch) | |
| tree | eddb6adb56fa021d804c4737336bfdef750e5e24 | |
| parent | cc2f31b2f0a35e8cc4dcfc567efafa5e97c7b8fb (diff) | |
| parent | 4296eda6d5d3f6fb41a8285018cc6efee26927e9 (diff) | |
Merge "Permissions: Include legacy SENSOR permissions with pre-grants." into main
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 09feb18d07bf..6ab30595e46b 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -216,12 +216,12 @@ final class DefaultPermissionGrantPolicy { private static final Set<String> SENSORS_PERMISSIONS = new ArraySet<>(); static { + SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS); + SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND); + if (Flags.replaceBodySensorPermissionEnabled()) { SENSORS_PERMISSIONS.add(HealthPermissions.READ_HEART_RATE); SENSORS_PERMISSIONS.add(HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND); - } else { - SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS); - SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND); } } |