Merge "API changes requires for Bluetooth apk inside the apex to build." (6f631e80) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ package android {
		field public static final String READ_WALLPAPER_INTERNAL = "android.permission.READ_WALLPAPER_INTERNAL";
		field public static final String READ_WIFI_CREDENTIAL = "android.permission.READ_WIFI_CREDENTIAL";
		field public static final String REAL_GET_TASKS = "android.permission.REAL_GET_TASKS";
		field public static final String RECEIVE_BLUETOOTH_MAP = "android.permission.RECEIVE_BLUETOOTH_MAP";
		field public static final String RECEIVE_DATA_ACTIVITY_CHANGE = "android.permission.RECEIVE_DATA_ACTIVITY_CHANGE";
		field public static final String RECEIVE_DEVICE_CUSTOMIZATION_READY = "android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY";
		field public static final String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST";
		@@ -311,6 +312,7 @@ package android {
		field public static final String WRITE_EMBEDDED_SUBSCRIPTIONS = "android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS";
		field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
		field public static final String WRITE_OBB = "android.permission.WRITE_OBB";
		field public static final String WRITE_SMS = "android.permission.WRITE_SMS";
		}

		public static final class Manifest.permission_group {
		@@ -1978,6 +1980,7 @@ package android.content {
		method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.content.Intent registerReceiverForAllUsers(@Nullable android.content.BroadcastReceiver, @NonNull android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);
		method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
		method public void sendBroadcastMultiplePermissions(@NonNull android.content.Intent, @NonNull String[], @Nullable android.app.BroadcastOptions);
		method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);
		field public static final String APP_HIBERNATION_SERVICE = "app_hibernation";
		@@ -2077,6 +2080,7 @@ package android.content {
		field public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";
		field public static final String ACTION_USER_ADDED = "android.intent.action.USER_ADDED";
		field public static final String ACTION_USER_REMOVED = "android.intent.action.USER_REMOVED";
		field public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED";
		field public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";
		field public static final String CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS";
		field public static final String EXTRA_CALLING_PACKAGE = "android.intent.extra.CALLING_PACKAGE";
		@@ -2097,7 +2101,9 @@ package android.content {
		field public static final String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
		field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";
		field public static final String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";
		field public static final String EXTRA_USER_HANDLE = "android.intent.extra.user_handle";
		field public static final String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";
		field public static final int FLAG_RECEIVER_INCLUDE_BACKGROUND = 16777216; // 0x1000000
		field public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 67108864; // 0x4000000
		field public static final String METADATA_SETUP_VERSION = "android.SETUP_VERSION";
		}

core/java/android/content/Context.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.annotation.TestApi;
		import android.annotation.UiContext;
		import android.annotation.UserIdInt;
		import android.app.ActivityManager;
		import android.app.BroadcastOptions;
		import android.app.GameManager;
		import android.app.IApplicationThread;
		import android.app.IServiceConnection;
		@@ -2247,6 +2248,27 @@ public abstract class Context {
		throw new RuntimeException("Not implemented. Must override in a subclass.");
		}

		/**
		* Version of {@link #sendBroadcastMultiplePermissions(Intent, String[])} that allows you to
		* specify the {@link android.app.BroadcastOptions}.
		*
		* @param intent The Intent to broadcast; all receivers matching this
		* Intent will receive the broadcast.
		* @param receiverPermissions Array of names of permissions that a receiver must hold
		* in order to receive your broadcast.
		* If empty, no permissions are required.
		* @param options Additional sending options, generated from a
		* {@link android.app.BroadcastOptions}.
		* @see #sendBroadcastMultiplePermissions(Intent, String[])
		* @see android.app.BroadcastOptions
		* @hide
		*/
		@SystemApi
		public void sendBroadcastMultiplePermissions(@NonNull Intent intent,
		@NonNull String[] receiverPermissions, @Nullable BroadcastOptions options) {
		sendBroadcastMultiplePermissions(intent, receiverPermissions, options.toBundle());
		}

		/**
		* Broadcast the given intent to all interested BroadcastReceivers, allowing
		* an array of required permissions to be enforced. This call is asynchronous; it returns

core/java/android/content/Intent.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -3836,7 +3836,7 @@ public class Intent implements Parcelable, Cloneable {
		* {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast.
		* @hide
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@SystemApi
		public static final String ACTION_USER_SWITCHED =
		"android.intent.action.USER_SWITCHED";

		@@ -5970,6 +5970,8 @@ public class Intent implements Parcelable, Cloneable {
		*
		* @hide
		*/
		@SystemApi
		@SuppressLint("ActionValue")
		public static final String EXTRA_USER_HANDLE =
		"android.intent.extra.user_handle";

		@@ -6824,6 +6826,7 @@ public class Intent implements Parcelable, Cloneable {
		*
		* @hide
		*/
		@SystemApi
		public static final int FLAG_RECEIVER_INCLUDE_BACKGROUND = 0x01000000;
		/**
		* If set, the broadcast will never go to manifest receivers in background (cached

core/res/AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -1536,7 +1536,7 @@
		android:protectionLevel="normal"
		android:permissionFlags="removed"/>

		<!-- @hide We need to keep this around for backwards compatibility -->
		<!-- @SystemApi @hide We need to keep this around for backwards compatibility -->
		<permission android:name="android.permission.WRITE_SMS"
		android:protectionLevel="normal"
		android:permissionFlags="removed"/>
		@@ -1614,7 +1614,7 @@
		<permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST"
		android:protectionLevel="signature\|privileged" />

		<!-- Allows an application to monitor incoming Bluetooth MAP messages, to record
		<!-- @SystemApi Allows an application to monitor incoming Bluetooth MAP messages, to record
		or perform processing on them. -->
		<!-- @hide -->
		<permission android:name="android.permission.RECEIVE_BLUETOOTH_MAP"