From 480e499ea4b704a2084b7194a4cbdae86046c030 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Thu, 20 May 2021 10:07:30 -0700 Subject: [PATCH] Add OPSTR_PHONE_CALL_* op strings to System API The PermissionController needs these ops to display phone calls in the Privacy Dashboard Test: build Bug: 176902658 Change-Id: Ib2a862520a73f3e65eeefd0fcba3843ef9112354 --- core/api/system-current.txt | 2 ++ core/api/test-current.txt | 2 -- core/java/android/app/AppOpsManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 143d674bc029c..5511d295ae31b 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 12d9bee0e3eef..20d70286d7250 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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 diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 92756b6b1391b..a730ef803a85d 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -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"; /**