am e2835f9f: am 212c006e: am c81ecb6d: Merge "Bug: 21589105 Rescope... (bb1a1e5f) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26421,7 +26421,8 @@ package android.provider {
	field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";		field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
	field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";		field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
	field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";		field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
	field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION";		field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
			field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
	field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";		field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
	field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";		field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";
	field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";		field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";

api/system-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28477,7 +28477,8 @@ package android.provider {
	field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";		field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
	field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";		field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
	field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";		field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
	field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION";		field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
			field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
	field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";		field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
	field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";		field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";
	field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";		field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";

core/java/android/provider/Settings.java

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -574,7 +574,22 @@ public final class Settings {
	*/		*/
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	public static final String ACTION_MANAGE_OVERLAY_PERMISSION =		public static final String ACTION_MANAGE_OVERLAY_PERMISSION =
	"android.settings.MANAGE_OVERLAY_PERMISSION";		"android.settings.action.MANAGE_OVERLAY_PERMISSION";

			/**
			* Activity Action: Show settings to toggle permission to allow app to
			* read/write system settings.
			* <p>
			* In some cases, a matching Activity may not exist, so ensure you
			* safeguard against this.
			* <p>
			* Input: Nothing.
			* <p>
			* Output: Nothing.
			*/
			@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
			public static final String ACTION_MANAGE_WRITE_SETTINGS =
			"android.settings.action.MANAGE_WRITE_SETTINGS";

	/**		/**
	* Activity Action: Show screen of details about a particular application.		* Activity Action: Show screen of details about a particular application.

core/res/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1526,7 +1526,7 @@
	<permission android:name="android.permission.WRITE_SETTINGS"		<permission android:name="android.permission.WRITE_SETTINGS"
	android:label="@string/permlab_writeSettings"		android:label="@string/permlab_writeSettings"
	android:description="@string/permdesc_writeSettings"		android:description="@string/permdesc_writeSettings"
	android:protectionLevel="dangerous" />		android:protectionLevel="signature\|system\|appop\|pre23" />

	<!-- @SystemApi Allows an application to modify the Google service map.		<!-- @SystemApi Allows an application to modify the Google service map.
	<p>Not for use by third-party applications. -->		<p>Not for use by third-party applications. -->