Snap for 4533842 from d6582078765cfc0fc11ccc319a935a9843f741f7 to pi-release (89bfad5f) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothA2dp.java

+88 −0

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

		import android.Manifest;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		@@ -102,6 +103,24 @@ public final class BluetoothA2dp implements BluetoothProfile {
		public static final String ACTION_AVRCP_CONNECTION_STATE_CHANGED =
		"android.bluetooth.a2dp.profile.action.AVRCP_CONNECTION_STATE_CHANGED";

		/**
		* Intent used to broadcast the selection of a connected device as active.
		*
		* <p>This intent will have one extra:
		* <ul>
		* <li> {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. It can
		* be null if no device is active. </li>
		* </ul>
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to
		* receive.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_ACTIVE_DEVICE_CHANGED =
		"android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED";

		/**
		* Intent used to broadcast the change in the Audio Codec state of the
		* A2DP Source profile.
		@@ -424,6 +443,75 @@ public final class BluetoothA2dp implements BluetoothProfile {
		}
		}

		/**
		* Select a connected device as active.
		*
		* The active device selection is per profile. An active device's
		* purpose is profile-specific. For example, A2DP audio streaming
		* is to the active A2DP Sink device. If a remote device is not
		* connected, it cannot be selected as active.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is not connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that the
		* {@link #ACTION_ACTIVE_DEVICE_CHANGED} intent will be broadcasted
		* with the active device.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device the remote Bluetooth device. Could be null to clear
		* the active device and stop streaming audio to a Bluetooth device.
		* @return false on immediate error, true otherwise
		* @hide
		*/
		public boolean setActiveDevice(@Nullable BluetoothDevice device) {
		if (DBG) log("setActiveDevice(" + device + ")");
		try {
		mServiceLock.readLock().lock();
		if (mService != null && isEnabled()
		&& ((device == null) \|\| isValidDevice(device))) {
		return mService.setActiveDevice(device);
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		return false;
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return false;
		} finally {
		mServiceLock.readLock().unlock();
		}
		}

		/**
		* Get the connected device that is active.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		* permission.
		*
		* @return the connected device that is active or null if no device
		* is active
		* @hide
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		@Nullable
		public BluetoothDevice getActiveDevice() {
		if (VDBG) log("getActiveDevice()");
		try {
		mServiceLock.readLock().lock();
		if (mService != null && isEnabled()) {
		return mService.getActiveDevice();
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		return null;
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return null;
		} finally {
		mServiceLock.readLock().unlock();
		}
		}

		/**
		* Set priority of the profile
		*

framework/java/android/bluetooth/BluetoothHeadset.java

+88 −0

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

		package android.bluetooth;

		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		@@ -93,6 +94,23 @@ public final class BluetoothHeadset implements BluetoothProfile {
		public static final String ACTION_AUDIO_STATE_CHANGED =
		"android.bluetooth.headset.profile.action.AUDIO_STATE_CHANGED";

		/**
		* Intent used to broadcast the selection of a connected device as active.
		*
		* <p>This intent will have one extra:
		* <ul>
		* <li> {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. It can
		* be null if no device is active. </li>
		* </ul>
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to
		* receive.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_ACTIVE_DEVICE_CHANGED =
		"android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED";

		/**
		* Intent used to broadcast that the headset has posted a
		@@ -982,6 +1000,76 @@ public final class BluetoothHeadset implements BluetoothProfile {
		return false;
		}

		/**
		* Select a connected device as active.
		*
		* The active device selection is per profile. An active device's
		* purpose is profile-specific. For example, in HFP and HSP profiles,
		* it is the device used for phone call audio. If a remote device is not
		* connected, it cannot be selected as active.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is not connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that the
		* {@link #ACTION_ACTIVE_DEVICE_CHANGED} intent will be broadcasted
		* with the active device.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device, could be null if phone call audio should not be
		* streamed to a headset
		* @return false on immediate error, true otherwise
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN)
		public boolean setActiveDevice(@Nullable BluetoothDevice device) {
		if (DBG) {
		Log.d(TAG, "setActiveDevice: " + device);
		}
		final IBluetoothHeadset service = mService;
		if (service != null && isEnabled() && (device == null \|\| isValidDevice(device))) {
		try {
		return service.setActiveDevice(device);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		}
		}
		if (service == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return false;
		}

		/**
		* Get the connected device that is active.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		* permission.
		*
		* @return the connected device that is active or null if no device
		* is active.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.BLUETOOTH)
		public BluetoothDevice getActiveDevice() {
		if (VDBG) {
		Log.d(TAG, "getActiveDevice");
		}
		final IBluetoothHeadset service = mService;
		if (service != null && isEnabled()) {
		try {
		return service.getActiveDevice();
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		}
		}
		if (service == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return null;
		}

		/**
		* check if in-band ringing is supported for this platform.
		*