Merge "Rename priority to connection policy in bluetooth apis" (98c91be8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+18 −3

Original line number	Diff line number	Diff line
		@@ -1248,6 +1248,11 @@ package android.app.usage {

		package android.bluetooth {

		public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
		}

		public final class BluetoothAdapter {
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean addOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean connectAllEnabledProfiles(@NonNull android.bluetooth.BluetoothDevice);
		@@ -1312,7 +1317,14 @@ package android.bluetooth {
		public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean connect(android.bluetooth.BluetoothDevice);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(android.bluetooth.BluetoothDevice);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int);
		}

		public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
		method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
		}

		public final class BluetoothPan implements android.bluetooth.BluetoothProfile {
		@@ -1331,9 +1343,12 @@ package android.bluetooth {
		}

		public interface BluetoothProfile {
		field public static final int CONNECTION_POLICY_ALLOWED = 100; // 0x64
		field public static final int CONNECTION_POLICY_FORBIDDEN = 0; // 0x0
		field public static final int CONNECTION_POLICY_UNKNOWN = -1; // 0xffffffff
		field public static final int PAN = 5; // 0x5
		field public static final int PRIORITY_OFF = 0; // 0x0
		field public static final int PRIORITY_ON = 100; // 0x64
		field @Deprecated public static final int PRIORITY_OFF = 0; // 0x0
		field @Deprecated public static final int PRIORITY_ON = 100; // 0x64
		}

		}

core/java/android/bluetooth/BluetoothA2dp.java

+49 −13

Original line number	Diff line number	Diff line
		@@ -17,10 +17,12 @@
		package android.bluetooth;

		import android.Manifest;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.Binder;
		@@ -439,28 +441,45 @@ public final class BluetoothA2dp implements BluetoothProfile {
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} orgetBluetoothManager
		* {@link #PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		* Priority can be one of {@link #PRIORITY_ON} or {@link #PRIORITY_OFF},
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) log("setPriority(" + device + ", " + priority + ")");
		return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));
		}

		/**
		* Set connection policy of the profile
		*
		* <p> The device should already be paired.
		* Connection policy can be one of {@link #CONNECTION_POLICY_ALLOWED},
		* {@link #CONNECTION_POLICY_FORBIDDEN}, {@link #CONNECTION_POLICY_UNKNOWN}
		*
		* @param device Paired bluetooth device
		* @param connectionPolicy is the connection policy to set to for this profile
		* @return true if connectionPolicy is set, false on error
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setConnectionPolicy(@NonNull BluetoothDevice device,
		@ConnectionPolicy int connectionPolicy) {
		if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");
		try {
		final IBluetoothA2dp service = getService();
		if (service != null && isEnabled()
		&& isValidDevice(device)) {
		if (priority != BluetoothProfile.PRIORITY_OFF
		&& priority != BluetoothProfile.PRIORITY_ON) {
		if (connectionPolicy != BluetoothProfile.CONNECTION_POLICY_FORBIDDEN
		&& connectionPolicy != BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
		return false;
		}
		return service.setPriority(device, priority);
		return service.setConnectionPolicy(device, connectionPolicy);
		}
		if (service == null) Log.w(TAG, "Proxy not attached to service");
		return false;
		@@ -474,8 +493,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		* {@link #PRIORITY_OFF}, {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* @param device Bluetooth device
		* @return priority of the device
		@@ -485,17 +503,35 @@ public final class BluetoothA2dp implements BluetoothProfile {
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		public int getPriority(BluetoothDevice device) {
		if (VDBG) log("getPriority(" + device + ")");
		return BluetoothAdapter.connectionPolicyToPriority(getConnectionPolicy(device));
		}

		/**
		* Get the connection policy of the profile.
		*
		* <p> The connection policy can be any of:
		* {@link #CONNECTION_POLICY_ALLOWED}, {@link #CONNECTION_POLICY_FORBIDDEN},
		* {@link #CONNECTION_POLICY_UNKNOWN}
		*
		* @param device Bluetooth device
		* @return connection policy of the device
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {
		if (VDBG) log("getConnectionPolicy(" + device + ")");
		try {
		final IBluetoothA2dp service = getService();
		if (service != null && isEnabled()
		&& isValidDevice(device)) {
		return service.getPriority(device);
		return service.getConnectionPolicy(device);
		}
		if (service == null) Log.w(TAG, "Proxy not attached to service");
		return BluetoothProfile.PRIORITY_OFF;
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return BluetoothProfile.PRIORITY_OFF;
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		}
		}

core/java/android/bluetooth/BluetoothA2dpSink.java

+50 −15

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package android.bluetooth;

		import android.Manifest;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.Binder;
		@@ -317,27 +320,43 @@ public final class BluetoothA2dpSink implements BluetoothProfile {
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} orgetBluetoothManager
		* {@link #PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		* Priority can be one of {@link #PRIORITY_ON} or {@link #PRIORITY_OFF},
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) log("setPriority(" + device + ", " + priority + ")");
		return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));
		}

		/**
		* Set connection policy of the profile
		*
		* <p> The device should already be paired.
		* Connection policy can be one of {@link #CONNECTION_POLICY_ALLOWED},
		* {@link #CONNECTION_POLICY_FORBIDDEN}, {@link #CONNECTION_POLICY_UNKNOWN}
		*
		* @param device Paired bluetooth device
		* @param connectionPolicy is the connection policy to set to for this profile
		* @return true if connectionPolicy is set, false on error
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
		if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");
		final IBluetoothA2dpSink service = getService();
		if (service != null && isEnabled() && isValidDevice(device)) {
		if (priority != BluetoothProfile.PRIORITY_OFF
		&& priority != BluetoothProfile.PRIORITY_ON) {
		if (connectionPolicy != BluetoothProfile.CONNECTION_POLICY_FORBIDDEN
		&& connectionPolicy != BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
		return false;
		}
		try {
		return service.setPriority(device, priority);
		return service.setConnectionPolicy(device, connectionPolicy);
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return false;
		@@ -351,28 +370,44 @@ public final class BluetoothA2dpSink implements BluetoothProfile {
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		* {@link #PRIORITY_OFF}, {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public int getPriority(BluetoothDevice device) {
		if (VDBG) log("getPriority(" + device + ")");
		return BluetoothAdapter.connectionPolicyToPriority(getConnectionPolicy(device));
		}

		/**
		* Get the connection policy of the profile.
		*
		* <p> The connection policy can be any of:
		* {@link #CONNECTION_POLICY_ALLOWED}, {@link #CONNECTION_POLICY_FORBIDDEN},
		* {@link #CONNECTION_POLICY_UNKNOWN}
		*
		* @param device Bluetooth device
		* @return connection policy of the device
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public int getConnectionPolicy(BluetoothDevice device) {
		if (VDBG) log("getConnectionPolicy(" + device + ")");
		final IBluetoothA2dpSink service = getService();
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getPriority(device);
		return service.getConnectionPolicy(device);
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return BluetoothProfile.PRIORITY_OFF;
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		}
		}
		if (service == null) Log.w(TAG, "Proxy not attached to service");
		return BluetoothProfile.PRIORITY_OFF;
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		}

		/**

core/java/android/bluetooth/BluetoothAdapter.java

+45 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.app.ActivityThread;
		import android.bluetooth.BluetoothProfile.ConnectionPolicy;
		import android.bluetooth.le.BluetoothLeAdvertiser;
		import android.bluetooth.le.BluetoothLeScanner;
		import android.bluetooth.le.PeriodicAdvertisingManager;
		@@ -3447,4 +3448,48 @@ public final class BluetoothAdapter {
		void onMetadataChanged(@NonNull BluetoothDevice device, int key,
		@Nullable byte[] value);
		}

		/**
		* Converts old constant of priority to the new for connection policy
		*
		* @param priority is the priority to convert to connection policy
		* @return the equivalent connection policy constant to the priority
		*
		* @hide
		*/
		public static @ConnectionPolicy int priorityToConnectionPolicy(int priority) {
		switch(priority) {
		case BluetoothProfile.PRIORITY_AUTO_CONNECT:
		return BluetoothProfile.CONNECTION_POLICY_ALLOWED;
		case BluetoothProfile.PRIORITY_ON:
		return BluetoothProfile.CONNECTION_POLICY_ALLOWED;
		case BluetoothProfile.PRIORITY_OFF:
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		case BluetoothProfile.PRIORITY_UNDEFINED:
		return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
		default:
		Log.e(TAG, "setPriority: Invalid priority: " + priority);
		return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
		}
		}

		/**
		* Converts new constant of connection policy to the old for priority
		*
		* @param connectionPolicy is the connection policy to convert to priority
		* @return the equivalent priority constant to the connectionPolicy
		*
		* @hide
		*/
		public static int connectionPolicyToPriority(@ConnectionPolicy int connectionPolicy) {
		switch(connectionPolicy) {
		case BluetoothProfile.CONNECTION_POLICY_ALLOWED:
		return BluetoothProfile.PRIORITY_ON;
		case BluetoothProfile.CONNECTION_POLICY_FORBIDDEN:
		return BluetoothProfile.PRIORITY_OFF;
		case BluetoothProfile.CONNECTION_POLICY_UNKNOWN:
		return BluetoothProfile.PRIORITY_UNDEFINED;
		}
		return BluetoothProfile.PRIORITY_UNDEFINED;
		}
		}

core/java/android/bluetooth/BluetoothHeadset.java

+48 −11

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.bluetooth;

		import android.Manifest;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		@@ -560,26 +561,45 @@ public final class BluetoothHeadset implements BluetoothProfile {
		* Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or
		* {@link BluetoothProfile#PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		* @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)}
		*/
		@Deprecated
		@SystemApi
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) log("setPriority(" + device + ", " + priority + ")");
		return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));
		}

		/**
		* Set connection policy of the profile
		*
		* <p> The device should already be paired.
		* Connection policy can be one of {@link #CONNECTION_POLICY_ALLOWED},
		* {@link #CONNECTION_POLICY_FORBIDDEN}, {@link #CONNECTION_POLICY_UNKNOWN}
		*
		* @param device Paired bluetooth device
		* @param connectionPolicy is the connection policy to set to for this profile
		* @return true if connectionPolicy is set, false on error
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setConnectionPolicy(@NonNull BluetoothDevice device,
		@ConnectionPolicy int connectionPolicy) {
		if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");
		final IBluetoothHeadset service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		if (priority != BluetoothProfile.PRIORITY_OFF
		&& priority != BluetoothProfile.PRIORITY_ON) {
		if (connectionPolicy != BluetoothProfile.CONNECTION_POLICY_FORBIDDEN
		&& connectionPolicy != BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
		return false;
		}
		try {
		return service.setPriority(device, priority);
		return service.setConnectionPolicy(device, connectionPolicy);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return false;
		@@ -596,26 +616,43 @@ public final class BluetoothHeadset implements BluetoothProfile {
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		@UnsupportedAppUsage
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public int getPriority(BluetoothDevice device) {
		if (VDBG) log("getPriority(" + device + ")");
		return BluetoothAdapter.connectionPolicyToPriority(getConnectionPolicy(device));
		}

		/**
		* Get the connection policy of the profile.
		*
		* <p> The connection policy can be any of:
		* {@link #CONNECTION_POLICY_ALLOWED}, {@link #CONNECTION_POLICY_FORBIDDEN},
		* {@link #CONNECTION_POLICY_UNKNOWN}
		*
		* @param device Bluetooth device
		* @return connection policy of the device
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {
		if (VDBG) log("getConnectionPolicy(" + device + ")");
		final IBluetoothHeadset service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getPriority(device);
		return service.getConnectionPolicy(device);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return PRIORITY_OFF;
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		}
		}
		if (service == null) Log.w(TAG, "Proxy not attached to service");
		return PRIORITY_OFF;
		return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
		}

		/**