Snap for 8513644 from 0a5347fe55927260f1797b2924ad548ecc25a0ff to tm-qpr1-release (923aa95c) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+20 −1

Original line number	Diff line number	Diff line
		@@ -752,7 +752,14 @@ public class BassClientService extends ProfileService {
		BluetoothStatusCodes.ERROR_BAD_PARAMETERS);
		return;
		}
		if (getConnectionState(sink) != BluetoothProfile.STATE_CONNECTED) {
		log("addSource: device is not connected");
		mCallbacks.notifySourceAddFailed(sink, sourceMetadata,
		BluetoothStatusCodes.ERROR_REMOTE_LINK_ERROR);
		return;
		}
		if (!hasRoomForBroadcastSourceAddition(sink)) {
		log("addSource: device has no room");
		mCallbacks.notifySourceAddFailed(sink, sourceMetadata,
		BluetoothStatusCodes.ERROR_REMOTE_NOT_ENOUGH_RESOURCES);
		return;
		@@ -788,6 +795,12 @@ public class BassClientService extends ProfileService {
		BluetoothStatusCodes.ERROR_BAD_PARAMETERS);
		return;
		}
		if (getConnectionState(sink) != BluetoothProfile.STATE_CONNECTED) {
		log("modifySource: device is not connected");
		mCallbacks.notifySourceModifyFailed(sink, sourceId,
		BluetoothStatusCodes.ERROR_REMOTE_LINK_ERROR);
		return;
		}
		Message message = stateMachine.obtainMessage(BassClientStateMachine.UPDATE_BCAST_SOURCE);
		message.arg1 = sourceId;
		message.obj = updatedMetadata;
		@@ -807,11 +820,17 @@ public class BassClientService extends ProfileService {
		BassClientStateMachine stateMachine = getOrCreateStateMachine(sink);
		if (sourceId == BassConstants.INVALID_SOURCE_ID
		\|\| stateMachine == null) {
		log("Error bad parameters: sourceId = " + sourceId);
		log("removeSource: Error bad parameters: sourceId = " + sourceId);
		mCallbacks.notifySourceRemoveFailed(sink, sourceId,
		BluetoothStatusCodes.ERROR_BAD_PARAMETERS);
		return;
		}
		if (getConnectionState(sink) != BluetoothProfile.STATE_CONNECTED) {
		log("removeSource: device is not connected");
		mCallbacks.notifySourceRemoveFailed(sink, sourceId,
		BluetoothStatusCodes.ERROR_REMOTE_LINK_ERROR);
		return;
		}
		Message message = stateMachine.obtainMessage(BassClientStateMachine.REMOVE_BCAST_SOURCE);
		message.arg1 = sourceId;
		stateMachine.sendMessage(message);

android/app/src/com/android/bluetooth/bass_client/BassClientStateMachine.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ import android.bluetooth.le.PeriodicAdvertisingManager;
		import android.bluetooth.le.PeriodicAdvertisingReport;
		import android.bluetooth.le.ScanRecord;
		import android.bluetooth.le.ScanResult;
		import android.os.Binder;
		import android.os.Looper;
		import android.os.Message;
		import android.os.ParcelUuid;
		@@ -186,12 +187,14 @@ public class BassClientStateMachine extends StateMachine {
		if (mBluetoothAdapter != null) {
		mPeriodicAdvManager = mBluetoothAdapter.getPeriodicAdvertisingManager();
		}
		long token = Binder.clearCallingIdentity();
		mIsAllowedList = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
		"persist.vendor.service.bt.wl", true);
		mDefNoPAS = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
		"persist.vendor.service.bt.defNoPAS", false);
		mForceSB = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
		"persist.vendor.service.bt.forceSB", false);
		Binder.restoreCallingIdentity(token);
		}

		static BassClientStateMachine make(BluetoothDevice device,

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+62 −5

Original line number	Diff line number	Diff line
		@@ -135,12 +135,15 @@ public class LeAudioService extends ProfileService {
		mIsActive = false;
		mActiveContexts = ACTIVE_CONTEXTS_NONE;
		mCodecStatus = null;
		mLostDevicesWhileStreaming = new ArrayList<>();
		}

		public Boolean mIsConnected;
		public Boolean mIsActive;
		public Integer mActiveContexts;
		public BluetoothLeAudioCodecStatus mCodecStatus;
		/* This can be non empty only for the streaming time */
		List<BluetoothDevice> mLostDevicesWhileStreaming;
		}

		List<BluetoothLeAudioCodecConfig> mInputLocalCodecCapabilities = new ArrayList<>();
		@@ -1014,6 +1017,21 @@ public class LeAudioService extends ProfileService {
		return BluetoothProfileConnectionInfo.CREATOR.createFromParcel(parcel);
		}

		private void clearLostDevicesWhileStreaming(LeAudioGroupDescriptor descriptor) {
		for (BluetoothDevice dev : descriptor.mLostDevicesWhileStreaming) {
		LeAudioStateMachine sm = mStateMachines.get(dev);
		if (sm == null) {
		continue;
		}

		LeAudioStackEvent stackEvent =
		new LeAudioStackEvent(LeAudioStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
		stackEvent.device = dev;
		stackEvent.valueInt1 = LeAudioStackEvent.CONNECTION_STATE_DISCONNECTED;
		sm.sendMessage(LeAudioStateMachine.STACK_EVENT, stackEvent);
		}
		}

		// Suppressed since this is part of a local process
		@SuppressLint("AndroidFrameworkRequiresPermission")
		void messageFromNative(LeAudioStackEvent stackEvent) {
		@@ -1025,7 +1043,41 @@ public class LeAudioService extends ProfileService {
		// Some events require device state machine
		synchronized (mStateMachines) {
		LeAudioStateMachine sm = mStateMachines.get(device);
		if (sm == null) {
		if (sm != null) {
		/*
		* To improve scenario when lead Le Audio device is disconnected for the
		* streaming group, while there are still other devices streaming,
		* LeAudioService will not notify audio framework or other users about
		* Le Audio lead device disconnection. Instead we try to reconnect under the hood
		* and keep using lead device as a audio device indetifier in the audio framework
		* in order to not stop the stream.
		*/
		int groupId = getGroupId(device);
		synchronized (mGroupLock) {
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(groupId);
		switch (stackEvent.valueInt1) {
		case LeAudioStackEvent.CONNECTION_STATE_DISCONNECTING:
		case LeAudioStackEvent.CONNECTION_STATE_DISCONNECTED:
		if (descriptor != null && (Objects.equals(device,
		mActiveAudioOutDevice)
		\|\| Objects.equals(device, mActiveAudioInDevice))
		&& (getConnectedPeerDevices(groupId).size() > 1)) {
		descriptor.mLostDevicesWhileStreaming.add(device);
		return;
		}
		break;
		case LeAudioStackEvent.CONNECTION_STATE_CONNECTED:
		case LeAudioStackEvent.CONNECTION_STATE_CONNECTING:
		if (descriptor != null) {
		descriptor.mLostDevicesWhileStreaming.remove(device);
		/* Try to connect other devices from the group */
		connectSet(device);
		}
		break;
		}
		}
		} else {
		/* state machine does not exist yet */
		switch (stackEvent.valueInt1) {
		case LeAudioStackEvent.CONNECTION_STATE_CONNECTED:
		case LeAudioStackEvent.CONNECTION_STATE_CONNECTING:
		@@ -1036,12 +1088,12 @@ public class LeAudioService extends ProfileService {
		default:
		break;
		}
		}

		if (sm == null) {
		Log.e(TAG, "Cannot process stack event: no state machine: " + stackEvent);
		return;
		}
		}

		sm.sendMessage(LeAudioStateMachine.STACK_EVENT, stackEvent);
		return;
		@@ -1153,6 +1205,8 @@ public class LeAudioService extends ProfileService {
		updateActiveDevices(groupId, descriptor.mActiveContexts,
		ACTIVE_CONTEXTS_NONE, descriptor.mIsActive);
		notifyGroupStatus = true;
		/* Clear lost devices */
		clearLostDevicesWhileStreaming(descriptor);
		}
		} else {
		Log.e(TAG, "no descriptors for group: " + groupId);
		@@ -2396,6 +2450,9 @@ public class LeAudioService extends ProfileService {
		ProfileService.println(sb, " mActiveContexts: " + descriptor.mActiveContexts);
		ProfileService.println(sb, " group lead: " + getConnectedGroupLeadDevice(groupId));
		ProfileService.println(sb, " first device: " + getFirstDeviceFromGroup(groupId));
		for (BluetoothDevice dev : descriptor.mLostDevicesWhileStreaming) {
		ProfileService.println(sb, " lost device: " + dev);
		}
		}
		}
		}

framework/java/android/bluetooth/BluetoothLeAudio.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,9 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
		* of the system, which wants to set to active a particular Le Audio group.
		*
		* Note: getActiveDevice() returns the Lead device for the currently active LE Audio group.
		* Note: When lead device gets disconnected, there will be new lead device for the group.
		* Note: When Lead device gets disconnected while Le Audio group is active and has more devices
		* in the group, then Lead device will not change. If Lead device gets disconnected, for the
		* Le Audio group which is not active, a new Lead device will be chosen
		*
		* @param groupId The group id.
		* @return group lead device.

framework/java/android/bluetooth/BluetoothLeAudioContentMetadata.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -25,7 +25,9 @@ import android.os.Parcelable;

		import java.nio.charset.StandardCharsets;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Objects;

		/**
		* A class representing the media metadata information defined in the Basic Audio Profile.
		@@ -50,6 +52,22 @@ public final class BluetoothLeAudioContentMetadata implements Parcelable {
		mRawMetadata = rawMetadata;
		}

		@Override
		public boolean equals(@Nullable Object o) {
		if (!(o instanceof BluetoothLeAudioContentMetadata)) {
		return false;
		}
		final BluetoothLeAudioContentMetadata other = (BluetoothLeAudioContentMetadata) o;
		return Objects.equals(mProgramInfo, other.getProgramInfo())
		&& Objects.equals(mLanguage, other.getLanguage())
		&& Arrays.equals(mRawMetadata, other.getRawMetadata());
		}

		@Override
		public int hashCode() {
		return Objects.hash(mProgramInfo, mLanguage, mRawMetadata);
		}

		/**
		* Get the title and/or summary of Audio Stream content in UTF-8 format.
		*