summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Evan Severson <evanseverson@google.com> 2021-02-05 12:55:54 -0800
committer Evan Severson <evanseverson@google.com> 2021-02-09 15:08:02 -0800
commit0e013b2c6a3baf697a893ae3fbcca594094241dd (patch)
tree50c77fd5aab970d12b06c4c320a86dd0bcc5863a
parent3d117d7efe0d687d6768439b74a43efb12bbb3ce (diff)
Fix compatibility of mainline module running on R
The module needs to be aware of which version each permission was introduced since it can run on older platform versions. Test: Flash RQ1A.210205.004, build permissioncontroller on S checkout, install permissioncontroller, verify boot Bug: 178426097 Change-Id: Iec2a1944f06daed27d4025a8675b8e5c947f26e8
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java
index 022940451..99851ca7d 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java
@@ -204,12 +204,16 @@ public final class Utils {
PLATFORM_PERMISSIONS.put(Manifest.permission.ACCEPT_HANDOVER, PHONE);
PLATFORM_PERMISSIONS.put(Manifest.permission.RECORD_AUDIO, MICROPHONE);
- PLATFORM_PERMISSIONS.put(Manifest.permission.RECORD_BACKGROUND_AUDIO, MICROPHONE);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ PLATFORM_PERMISSIONS.put(Manifest.permission.RECORD_BACKGROUND_AUDIO, MICROPHONE);
+ }
PLATFORM_PERMISSIONS.put(Manifest.permission.ACTIVITY_RECOGNITION, ACTIVITY_RECOGNITION);
PLATFORM_PERMISSIONS.put(Manifest.permission.CAMERA, CAMERA);
- PLATFORM_PERMISSIONS.put(Manifest.permission.BACKGROUND_CAMERA, CAMERA);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ PLATFORM_PERMISSIONS.put(Manifest.permission.BACKGROUND_CAMERA, CAMERA);
+ }
PLATFORM_PERMISSIONS.put(Manifest.permission.BODY_SENSORS, SENSORS);