diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-12 00:41:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-12 00:41:43 +0000 |
| commit | 0ecf6b6d4eca4cc063e6bad4b6524224d10d3424 (patch) | |
| tree | cd90110d97bc82b80d3e5eb0c4333a805dd40285 /core/java | |
| parent | 3b22f9b76dba4089954b900f57b6647b7f0a7d10 (diff) | |
| parent | 471f8cec334a242e235ead7c3251e6adfcb7c592 (diff) | |
Merge "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index ba547b74f106..771ba3db83be 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1139,9 +1139,17 @@ public class AppOpsManager { // TODO: Add as AppProtoEnums public static final int OP_RECORD_AUDIO_HOTWORD = 102; + /** + * App output audio is being recorded. + * + * @hide + */ + // TODO: Add as AppProtoEnums + public static final int OP_RECORD_AUDIO_OUTPUT = 106; + /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public static final int _NUM_OP = 104; + @UnsupportedAppUsage + public static final int _NUM_OP = 107; /** Access to coarse location information. */ public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; @@ -1488,6 +1496,13 @@ public class AppOpsManager { */ public static final String OPSTR_RECORD_AUDIO_HOTWORD = "android:record_audio_hotword"; + /** + * App output audio is being recorded + * + * @hide + */ + public static final String OPSTR_RECORD_AUDIO_OUTPUT = "android:record_audio_output"; + /** {@link #sAppOpsToNote} not initialized yet for this op */ private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0; /** Should not collect noting of this app-op in {@link #sAppOpsToNote} */ @@ -1682,6 +1697,9 @@ public class AppOpsManager { OP_PHONE_CALL_CAMERA, // OP_PHONE_CALL_CAMERA OP_RECORD_AUDIO_HOTWORD, // RECORD_AUDIO_HOTWORD OP_MANAGE_ONGOING_CALLS, // MANAGE_ONGOING_CALLS + 104, // placeholders + 105, + OP_RECORD_AUDIO_OUTPUT, // RECORD_AUDIO_OUTPUT }; /** @@ -1792,6 +1810,9 @@ public class AppOpsManager { OPSTR_PHONE_CALL_CAMERA, OPSTR_RECORD_AUDIO_HOTWORD, OPSTR_MANAGE_ONGOING_CALLS, + "", // placeholders + "", + OPSTR_RECORD_AUDIO_OUTPUT, }; /** @@ -1903,6 +1924,9 @@ public class AppOpsManager { "PHONE_CALL_CAMERA", "RECORD_AUDIO_HOTWORD", "MANAGE_ONGOING_CALLS", + "", // placeholders + "", + "RECORD_AUDIO_OUTPUT", }; /** @@ -2015,6 +2039,9 @@ public class AppOpsManager { null, // no permission for OP_PHONE_CALL_CAMERA null, // no permission for OP_RECORD_AUDIO_HOTWORD Manifest.permission.MANAGE_ONGOING_CALLS, + null, // placeholders + null, + null, // no permission for OP_RECORD_AUDIO_OUTPUT }; /** @@ -2127,6 +2154,9 @@ public class AppOpsManager { null, // PHONE_CALL_MICROPHONE null, // RECORD_AUDIO_HOTWORD null, // MANAGE_ONGOING_CALLS + null, // placeholders + null, + null, // RECORD_AUDIO_OUTPUT }; /** @@ -2238,6 +2268,9 @@ public class AppOpsManager { null, // PHONE_CALL_CAMERA null, // RECORD_AUDIO_HOTWORD null, // MANAGE_ONGOING_CALLS + null, // placeholders + null, + null, // RECORD_AUDIO_OUTPUT }; /** @@ -2348,6 +2381,9 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, // PHONE_CALL_CAMERA AppOpsManager.MODE_ALLOWED, // OP_RECORD_AUDIO_HOTWORD AppOpsManager.MODE_DEFAULT, // MANAGE_ONGOING_CALLS + AppOpsManager.MODE_DEFAULT, // placeholders + AppOpsManager.MODE_DEFAULT, + AppOpsManager.MODE_ALLOWED, // OP_RECORD_AUDIO_OUTPUT }; /** @@ -2462,6 +2498,9 @@ public class AppOpsManager { false, // PHONE_CALL_CAMERA false, // RECORD_AUDIO_HOTWORD true, // MANAGE_ONGOING_CALLS + false, // placeholders + false, + false, // RECORD_AUDIO_OUTPUT }; /** |