Merge "Rename intent to start a package's Open By Default page directly." (b3d533cc) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -362,6 +362,21 @@ public final class Settings {
	public static final String ACTION_MANAGE_UNKNOWN_APP_SOURCES =		public static final String ACTION_MANAGE_UNKNOWN_APP_SOURCES =
	"android.settings.MANAGE_UNKNOWN_APP_SOURCES";		"android.settings.MANAGE_UNKNOWN_APP_SOURCES";

			/**
			* Activity Action: Show the "Open by Default" page in a particular application's details page.
			* <p>
			* In some cases, a matching Activity may not exist, so ensure you safeguard against this.
			* <p>
			* Input: The Intent's data URI specifies the application package name
			* to be shown, with the "package" scheme. That is "package:com.my.app".
			* <p>
			* Output: Nothing.
			* @hide
			*/
			@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
			public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS =
			"com.android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";

	/**		/**
	* Activity Action: Show trusted credentials settings, opening to the user tab,		* Activity Action: Show trusted credentials settings, opening to the user tab,
	* to allow management of installed credentials.		* to allow management of installed credentials.
	@@ -808,21 +823,6 @@ public final class Settings {
	public static final String ACTION_APPLICATION_DETAILS_SETTINGS =		public static final String ACTION_APPLICATION_DETAILS_SETTINGS =
	"android.settings.APPLICATION_DETAILS_SETTINGS";		"android.settings.APPLICATION_DETAILS_SETTINGS";

	/**
	* Activity Action: Show the "Open by Default" page in a particular application's details page.
	* <p>
	* In some cases, a matching Activity may not exist, so ensure you safeguard against this.
	* <p>
	* Input: The Intent's data URI specifies the application package name
	* to be shown, with the "package" scheme. That is "package:com.my.app".
	* <p>
	* Output: Nothing.
	* @hide
	*/
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	public static final String ACTION_APPLICATION_DETAILS_SETTINGS_OPEN_BY_DEFAULT_PAGE =
	"android.settings.APPLICATION_DETAILS_SETTINGS_OPEN_BY_DEFAULT_PAGE";

	/**		/**
	* Activity Action: Show list of applications that have been running		* Activity Action: Show list of applications that have been running
	* foreground services (to the user "running in the background").		* foreground services (to the user "running in the background").

core/res/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4116,7 +4116,7 @@
	<!-- Allows an application to directly open the "Open by default" page inside a package's		<!-- Allows an application to directly open the "Open by default" page inside a package's
	Details screen.		Details screen.
	@hide <p>Not for use by third-party applications. -->		@hide <p>Not for use by third-party applications. -->
	<permission android:name="android.permission.OPEN_APPLICATION_DETAILS_OPEN_BY_DEFAULT_PAGE"		<permission android:name="android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS"
	android:protectionLevel="signature" />		android:protectionLevel="signature" />

	<!-- Allows hidden API checks to be disabled when starting a process.		<!-- Allows hidden API checks to be disabled when starting a process.