diff --git a/core/api/current.txt b/core/api/current.txt index 3a012332a4a40..9cc8a5abee416 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -10729,7 +10729,7 @@ package android.content { field public static final String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; field public static final String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final String ACTION_CHOOSER = "android.intent.action.CHOOSER"; - field public static final String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; + field @Deprecated @RequiresPermission("android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS") public static final String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; field public static final String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT"; field public static final String ACTION_CREATE_REMINDER = "android.intent.action.CREATE_REMINDER"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index a03bdf2da2bea..13a1381028003 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2393,8 +2393,19 @@ public class Intent implements Parcelable, Cloneable { * Broadcast Action: This is broadcast when a user action should request a * temporary system dialog to dismiss. Some examples of temporary system * dialogs are the notification window-shade and the recent tasks dialog. + * + * @deprecated This intent is deprecated for third-party applications starting from Android + * {@link Build.VERSION_CODES#S} for security reasons. Unauthorized usage by applications + * will result in the broadcast intent being dropped for apps targeting API level less than + * {@link Build.VERSION_CODES#S} and in a {@link SecurityException} for apps targeting SDK + * level {@link Build.VERSION_CODES#S} or higher. Instrumentation initiated from the shell + * (eg. tests) is still able to use the intent. The platform will automatically collapse + * the proper system dialogs in the proper use-cases. For all others, the user is the one in + * control of closing dialogs. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + @RequiresPermission(android.Manifest.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS) + @Deprecated public static final String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; /** * Broadcast Action: Trigger the download and eventual installation