Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add OPSTR_PHONE_CALL_* op strings to System API" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-21 00:11:49 +00:00
committed by Android (Google) Code Review
parent 6e8cafb843 480e499ea4
commit c7e659afd0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -487,6 +487,8 @@ package android.app {
field public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls"; field public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls";
field public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone"; field public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone";
field public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells"; field public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells";
field public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera";
field public static final String OPSTR_PHONE_CALL_MICROPHONE = "android:phone_call_microphone";
field public static final String OPSTR_PLAY_AUDIO = "android:play_audio"; field public static final String OPSTR_PLAY_AUDIO = "android:play_audio";
field public static final String OPSTR_POST_NOTIFICATION = "android:post_notification"; field public static final String OPSTR_POST_NOTIFICATION = "android:post_notification";
field public static final String OPSTR_PROJECT_MEDIA = "android:project_media"; field public static final String OPSTR_PROJECT_MEDIA = "android:project_media";

2
core/api/test-current.txt
View File

@@ -249,8 +249,6 @@ package android.app {
field public static final String OPSTR_ACTIVITY_RECOGNITION = "android:activity_recognition"; field public static final String OPSTR_ACTIVITY_RECOGNITION = "android:activity_recognition";
field public static final String OPSTR_ACTIVITY_RECOGNITION_SOURCE = "android:activity_recognition_source"; field public static final String OPSTR_ACTIVITY_RECOGNITION_SOURCE = "android:activity_recognition_source";
field public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls"; field public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls";
field public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera";
field public static final String OPSTR_PHONE_CALL_MICROPHONE = "android:phone_call_microphone";
field public static final String OPSTR_USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER = "android:use_icc_auth_with_device_identifier"; field public static final String OPSTR_USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER = "android:use_icc_auth_with_device_identifier";
field public static final int OP_COARSE_LOCATION = 0; // 0x0 field public static final int OP_COARSE_LOCATION = 0; // 0x0
field public static final int OP_RECORD_AUDIO = 27; // 0x1b field public static final int OP_RECORD_AUDIO = 27; // 0x1b

4
core/java/android/app/AppOpsManager.java
View File

@@ -1588,14 +1588,14 @@ public class AppOpsManager {
* *
* @hide * @hide
*/ */
@TestApi @SystemApi
public static final String OPSTR_PHONE_CALL_MICROPHONE = "android:phone_call_microphone"; public static final String OPSTR_PHONE_CALL_MICROPHONE = "android:phone_call_microphone";
/** /**
* Phone call is using camera * Phone call is using camera
* *
* @hide * @hide
*/ */
@TestApi @SystemApi
public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera"; public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera";
/** /**