Merge "Expose BAL related APIs as @SystemApi" (f323b01e) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −1

core/java/android/content/Context.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -382,6 +382,7 @@ public abstract class Context {
	* {@link android.Manifest.permission#START_ACTIVITIES_FROM_BACKGROUND}.		* {@link android.Manifest.permission#START_ACTIVITIES_FROM_BACKGROUND}.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 0x00100000;		public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 0x00100000;

	/**		/**

core/res/AndroidManifest.xml

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2539,8 +2539,7 @@
	<permission android:name="android.permission.START_ANY_ACTIVITY"		<permission android:name="android.permission.START_ANY_ACTIVITY"
	android:protectionLevel="signature" />		android:protectionLevel="signature" />

	<!-- Allows an application to start activities from background		<!-- @SystemApi @hide Allows an application to start activities from background -->
	@hide -->
	<permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"		<permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"
	android:protectionLevel="signature\|privileged\|vendorPrivileged\|oem\|verifier" />		android:protectionLevel="signature\|privileged\|vendorPrivileged\|oem\|verifier" />

non-updatable-api/system-current.txt

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -225,6 +225,7 @@ package android {
	field public static final String SET_WALLPAPER_COMPONENT = "android.permission.SET_WALLPAPER_COMPONENT";		field public static final String SET_WALLPAPER_COMPONENT = "android.permission.SET_WALLPAPER_COMPONENT";
	field public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";		field public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";
	field public static final String SHUTDOWN = "android.permission.SHUTDOWN";		field public static final String SHUTDOWN = "android.permission.SHUTDOWN";
			field public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission.START_ACTIVITIES_FROM_BACKGROUND";
	field public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";		field public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";
	field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";		field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";
	field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";		field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";
	@@ -594,7 +595,7 @@ package android.app {

	public class BroadcastOptions {		public class BroadcastOptions {
	method public static android.app.BroadcastOptions makeBasic();		method public static android.app.BroadcastOptions makeBasic();
	method @RequiresPermission("android.permission.START_ACTIVITIES_FROM_BACKGROUND") public void setBackgroundActivityStartsAllowed(boolean);		method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);
	method public void setDontSendToRestrictedApps(boolean);		method public void setDontSendToRestrictedApps(boolean);
	method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void setTemporaryAppWhitelistDuration(long);		method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void setTemporaryAppWhitelistDuration(long);
	method public android.os.Bundle toBundle();		method public android.os.Bundle toBundle();
	@@ -1802,6 +1803,7 @@ package android.content {
	field public static final String APP_PREDICTION_SERVICE = "app_prediction";		field public static final String APP_PREDICTION_SERVICE = "app_prediction";
	field public static final String BACKUP_SERVICE = "backup";		field public static final String BACKUP_SERVICE = "backup";
	field public static final String BATTERY_STATS_SERVICE = "batterystats";		field public static final String BATTERY_STATS_SERVICE = "batterystats";
			field public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000
	field public static final String BUGREPORT_SERVICE = "bugreport";		field public static final String BUGREPORT_SERVICE = "bugreport";
	field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";		field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";
	field public static final String CONTEXTHUB_SERVICE = "contexthub";		field public static final String CONTEXTHUB_SERVICE = "contexthub";

Original line number	Original line	Diff line number	Diff line
	@@ -225,6 +225,7 @@ package android {
	field public static final String SET_WALLPAPER_COMPONENT = "android.permission.SET_WALLPAPER_COMPONENT";		field public static final String SET_WALLPAPER_COMPONENT = "android.permission.SET_WALLPAPER_COMPONENT";
	field public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";		field public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";
	field public static final String SHUTDOWN = "android.permission.SHUTDOWN";		field public static final String SHUTDOWN = "android.permission.SHUTDOWN";
			field public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission.START_ACTIVITIES_FROM_BACKGROUND";
	field public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";		field public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";
	field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";		field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";
	field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";		field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";
	@@ -594,7 +595,7 @@ package android.app {

	public class BroadcastOptions {		public class BroadcastOptions {
	method public static android.app.BroadcastOptions makeBasic();		method public static android.app.BroadcastOptions makeBasic();
	method @RequiresPermission("android.permission.START_ACTIVITIES_FROM_BACKGROUND") public void setBackgroundActivityStartsAllowed(boolean);		method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);
	method public void setDontSendToRestrictedApps(boolean);		method public void setDontSendToRestrictedApps(boolean);
	method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void setTemporaryAppWhitelistDuration(long);		method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void setTemporaryAppWhitelistDuration(long);
	method public android.os.Bundle toBundle();		method public android.os.Bundle toBundle();
	@@ -1742,6 +1743,7 @@ package android.content {
	field public static final String APP_PREDICTION_SERVICE = "app_prediction";		field public static final String APP_PREDICTION_SERVICE = "app_prediction";
	field public static final String BACKUP_SERVICE = "backup";		field public static final String BACKUP_SERVICE = "backup";
	field public static final String BATTERY_STATS_SERVICE = "batterystats";		field public static final String BATTERY_STATS_SERVICE = "batterystats";
			field public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000
	field public static final String BUGREPORT_SERVICE = "bugreport";		field public static final String BUGREPORT_SERVICE = "bugreport";
	field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";		field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";
	field public static final String CONTEXTHUB_SERVICE = "contexthub";		field public static final String CONTEXTHUB_SERVICE = "contexthub";