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

Commit af9c30aa authored Feb 18, 2016 by Sudheer Shanka Committed by Android (Google) Code Review Feb 18, 2016

Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev

parents 0f900c02 aebd5dd7

api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32174,7 +32174,6 @@ package android.provider {
	field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";		field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
	field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";		field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
	field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";		field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";
	field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
	field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";		field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
	field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";		field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
	field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";		field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";

api/system-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34661,7 +34661,6 @@ package android.provider {
	field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";		field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
	field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";		field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
	field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";		field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";
	field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
	field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";		field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
	field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";		field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
	field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";		field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";

api/test-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32187,7 +32187,6 @@ package android.provider {
	field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";		field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
	field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";		field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
	field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";		field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";
	field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
	field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";		field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
	field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";		field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
	field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";		field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";

core/java/android/provider/Settings.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1218,6 +1218,8 @@ public final class Settings {
	* Input: Nothing.		* Input: Nothing.
	* <p>		* <p>
	* Output: Nothing.		* Output: Nothing.
			*
			* @hide
	*/		*/
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS		public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS