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

Commit 84838b0a authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e059 

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

Change-Id: I51f66b5bbe5c7af178541d6a86dfaec02a0c5973
parents 7e94f9e8 9666e059

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ package android { 
    field public static final String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";

    field public static final String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";

    field public static final String MANAGE_EXTERNAL_STORAGE = "android.permission.MANAGE_EXTERNAL_STORAGE";

    field public static final String MANAGE_ONGOING_CALLS = "android.permission.MANAGE_ONGOING_CALLS";

    field public static final String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";

    field public static final String MASTER_CLEAR = "android.permission.MASTER_CLEAR";

    field public static final String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ package android.app { 
    field public static final String OPSTR_LOADER_USAGE_STATS = "android:loader_usage_stats";

    field public static final String OPSTR_MANAGE_EXTERNAL_STORAGE = "android:manage_external_storage";

    field public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";

    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_PLAY_AUDIO = "android:play_audio";

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ package android { 
    field public static final String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";

    field public static final String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";

    field public static final String MANAGE_EXTERNAL_STORAGE = "android.permission.MANAGE_EXTERNAL_STORAGE";

    field public static final String MANAGE_ONGOING_CALLS = "android.permission.MANAGE_ONGOING_CALLS";

    field public static final String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";

    field public static final String MASTER_CLEAR = "android.permission.MASTER_CLEAR";

    field public static final String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ package android.app { 
    field public static final String OPSTR_LOADER_USAGE_STATS = "android:loader_usage_stats";

    field public static final String OPSTR_MANAGE_EXTERNAL_STORAGE = "android:manage_external_storage";

    field public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";

    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_PLAY_AUDIO = "android:play_audio";

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ package android.app { 
    field public static final String KEY_BG_STATE_SETTLE_TIME = "bg_state_settle_time";

    field public static final String KEY_FG_SERVICE_STATE_SETTLE_TIME = "fg_service_state_settle_time";

    field public static final String KEY_TOP_STATE_SETTLE_TIME = "top_state_settle_time";

    field public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls";

    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_START_FOREGROUND = 76; // 0x4c