Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caa9b99f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664156

Change-Id: Ia814a99f759ef6dc4266f0bb09dcf56f75d64481
parents 1abe9e5d c7e659af

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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_MUTE_MICROPHONE = "android:mute_microphone";

    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_POST_NOTIFICATION = "android:post_notification";

    field public static final String OPSTR_PROJECT_MEDIA = "android:project_media";

core/api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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_SOURCE = "android:activity_recognition_source";

    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 int OP_COARSE_LOCATION = 0; // 0x0

    field public static final int OP_RECORD_AUDIO = 27; // 0x1b

core/java/android/app/AppOpsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1588,14 +1588,14 @@ public class AppOpsManager { 
     *

     * @hide

     */

    @TestApi

    @SystemApi

    public static final String OPSTR_PHONE_CALL_MICROPHONE = "android:phone_call_microphone";

    /**

     * Phone call is using camera

     *

     * @hide

     */

    @TestApi

    @SystemApi

    public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera";



    /**