am 67dfa491: am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the... (28aad8ef) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26430,6 +26430,7 @@ 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_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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28508,6 +28508,7 @@ 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_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

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -561,6 +561,21 @@ public final class Settings {
	public static final String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS =		public static final String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS =
	"android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";		"android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";

			/**
			* Activity Action: Show settings to toggle permission to draw on top of
			* other apps.
			* <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_OVERLAY_PERMISSION =
			"android.settings.MANAGE_OVERLAY_PERMISSION";

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

core/java/com/android/internal/logging/MetricsLogger.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ public class MetricsLogger implements MetricsConstants {
	public static final int ACTION_BRIGHTNESS = 218;		public static final int ACTION_BRIGHTNESS = 218;
	public static final int ACTION_BRIGHTNESS_AUTO = 219;		public static final int ACTION_BRIGHTNESS_AUTO = 219;
	public static final int BRIGHTNESS_DIALOG = 220;		public static final int BRIGHTNESS_DIALOG = 220;
			public static final int SYSTEM_ALERT_WINDOW_APPS = 221;
	// Temporary constants go here, to await migration to MetricsConstants.		// Temporary constants go here, to await migration to MetricsConstants.

	public static void visible(Context context, int category) throws IllegalArgumentException {		public static void visible(Context context, int category) throws IllegalArgumentException {

core/res/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1424,7 +1424,7 @@
	<permission android:name="android.permission.SYSTEM_ALERT_WINDOW"		<permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
	android:label="@string/permlab_systemAlertWindow"		android:label="@string/permlab_systemAlertWindow"
	android:description="@string/permdesc_systemAlertWindow"		android:description="@string/permdesc_systemAlertWindow"
	android:protectionLevel="dangerous" />		android:protectionLevel="signature\|system\|appop" />

	<!-- ================================== -->		<!-- ================================== -->
	<!-- Permissions affecting the system wallpaper -->		<!-- Permissions affecting the system wallpaper -->