From e99757e4b1f1855f52e0d0b60d88f4bf71bd3802 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 14 Apr 2017 14:41:45 -0700 Subject: [PATCH] MASTER_CLEAR action should not be public Limit it to SystemApi, for passing intent tests Bug: 36977779 Test: cts test Change-Id: I716b94fc3cef43db1fafbfdad8dba0d850bec474 --- api/current.txt | 1 - api/test-current.txt | 1 - core/java/android/content/Intent.java | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 4149d03ffeac0..9f821f9c1dd2f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9323,7 +9323,6 @@ package android.content { field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED"; field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE"; field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE"; - field public static final deprecated java.lang.String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL"; field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON"; field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING"; diff --git a/api/test-current.txt b/api/test-current.txt index 1fed007580575..84e8781b9590c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -9357,7 +9357,6 @@ package android.content { field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED"; field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE"; field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE"; - field public static final deprecated java.lang.String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL"; field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON"; field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 0da4f8ddbad97..5ca4fa343271b 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3424,8 +3424,10 @@ public class Intent implements Parcelable, Cloneable { /** * Deprecated - use ACTION_FACTORY_RESET instead. + * @hide */ @Deprecated + @SystemApi public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; /**