diff options
| author | 2019-03-05 17:51:36 +0000 | |
|---|---|---|
| committer | 2019-03-05 17:51:36 +0000 | |
| commit | 48636daaf8822b96c65d22d9bfced509d9a57f3f (patch) | |
| tree | 8e622db7984bb695a0d9393b5ae2a044bd747e93 | |
| parent | 6d6b53969aebe40f1b258b6b1e64877bdb7184c6 (diff) | |
| parent | 3f5c6995fd2739d22c8ee4172af40bbda42eb65f (diff) | |
Merge "Add new permission to guard Intent.REVIEW_ACCESSIBILITY_SERVICES."
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 3a6a9741e581..7518bb795b97 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -164,6 +164,7 @@ package android { field public static final String RESET_PASSWORD = "android.permission.RESET_PASSWORD"; field public static final String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS"; field public static final String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT"; + field public static final String REVIEW_ACCESSIBILITY_SERVICES = "android.permission.REVIEW_ACCESSIBILITY_SERVICES"; field public static final String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS"; field public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS"; field public static final String SEND_DEVICE_CUSTOMIZATION_READY = "android.permission.SEND_DEVICE_CUSTOMIZATION_READY"; @@ -1414,7 +1415,7 @@ package android.content { field public static final String ACTION_PRE_BOOT_COMPLETED = "android.intent.action.PRE_BOOT_COMPLETED"; field public static final String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART"; field public static final String ACTION_RESOLVE_INSTANT_APP_PACKAGE = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE"; - field public static final String ACTION_REVIEW_ACCESSIBILITY_SERVICES = "android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"; + field @RequiresPermission(android.Manifest.permission.REVIEW_ACCESSIBILITY_SERVICES) public static final String ACTION_REVIEW_ACCESSIBILITY_SERVICES = "android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"; field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_REVIEW_APP_PERMISSION_USAGE = "android.intent.action.REVIEW_APP_PERMISSION_USAGE"; field public static final String ACTION_REVIEW_PERMISSIONS = "android.intent.action.REVIEW_PERMISSIONS"; field public static final String ACTION_REVIEW_PERMISSION_USAGE = "android.intent.action.REVIEW_PERMISSION_USAGE"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index d3b8e29d7399..0715572c03c0 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2124,6 +2124,7 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SystemApi + @RequiresPermission(android.Manifest.permission.REVIEW_ACCESSIBILITY_SERVICES) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_REVIEW_ACCESSIBILITY_SERVICES = "android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index c219cd067aaf..4c4393d4fd61 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4463,6 +4463,11 @@ @hide --> <permission android:name="android.permission.MANAGE_SENSOR_PRIVACY" android:protectionLevel="signature" /> + <!-- @SystemApi Permission that protects the {@link Intent#ACTION_REVIEW_ACCESSIBILITY_SERVICES} + intent. + @hide --> + <permission android:name="android.permission.REVIEW_ACCESSIBILITY_SERVICES" + android:protectionLevel="signature" /> <!-- @SystemApi Allows an activity to replace the app name and icon displayed in share targets in the sharesheet for the Q-release and later. |