summaryrefslogtreecommitdiff
path: root/core/java/android/permission/PermissionUsageHelper.java
diff options
context:
space:
mode:
authorNate Myren <ntmyren@google.com>2022-05-04 15:41:10 -0700
committerNate Myren <ntmyren@google.com>2022-05-09 23:35:37 +0000
commitbd934eba0f04a79b092e4aa9dad8884c70bad99c (patch)
treea40bd4336f810a8772d4bb1a560ae24ee9d37dcc /core/java/android/permission/PermissionUsageHelper.java
parent827c5557cd8d2d58f71fb7651a5b39846e5b0046 (diff)
Note RECEIVE_AMBIENT_TRIGGER_AUDIO in the SoundTrigger
This op gets around the background restrictions on RECORD_AUDIO, when used for SoundTrigger detection In addition, moves the precise logic for soundtrigger RECORD_AUDIO checks out of the soundtrigger system Fixes: 230430779 Test: manual Change-Id: I6d63c99e2d31e3f668070ac82afed71ff6672c9e Merged-In: I6d63c99e2d31e3f668070ac82afed71ff6672c9e
Diffstat (limited to 'core/java/android/permission/PermissionUsageHelper.java')
-rw-r--r--core/java/android/permission/PermissionUsageHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/permission/PermissionUsageHelper.java b/core/java/android/permission/PermissionUsageHelper.java
index 4ed939c48bd7..f5f1c374b636 100644
--- a/core/java/android/permission/PermissionUsageHelper.java
+++ b/core/java/android/permission/PermissionUsageHelper.java
@@ -30,6 +30,7 @@ import static android.app.AppOpsManager.OPSTR_COARSE_LOCATION;
import static android.app.AppOpsManager.OPSTR_FINE_LOCATION;
import static android.app.AppOpsManager.OPSTR_PHONE_CALL_CAMERA;
import static android.app.AppOpsManager.OPSTR_PHONE_CALL_MICROPHONE;
+import static android.app.AppOpsManager.OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO;
import static android.app.AppOpsManager.OPSTR_RECORD_AUDIO;
import static android.app.AppOpsManager.OP_CAMERA;
import static android.app.AppOpsManager.OP_FLAGS_ALL_TRUSTED;
@@ -137,6 +138,7 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
private static final List<String> MIC_OPS = List.of(
OPSTR_PHONE_CALL_MICROPHONE,
+ OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO,
OPSTR_RECORD_AUDIO
);
@@ -147,6 +149,7 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
private static @NonNull String getGroupForOp(String op) {
switch (op) {
+ case OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO:
case OPSTR_RECORD_AUDIO:
return MICROPHONE;
case OPSTR_CAMERA: