Merge "[le audio] Fix removing broadcast source when PA is still synced" into main (1e60fe46) · Commits · e / os / android_packages_modules_Bluetooth

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

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1151,6 +1151,7 @@ class BassClientStateMachine extends StateMachine {
	log("processBroadcastReceiverState: invalid index: " + recvState.getSourceId());		log("processBroadcastReceiverState: invalid index: " + recvState.getSourceId());
	return;		return;
	}		}
			int sourceId = recvState.getSourceId();
	BluetoothLeBroadcastReceiveState oldRecvState =		BluetoothLeBroadcastReceiveState oldRecvState =
	mBluetoothLeBroadcastReceiveStates.get(characteristic.getInstanceId());		mBluetoothLeBroadcastReceiveStates.get(characteristic.getInstanceId());
	if (oldRecvState == null) {		if (oldRecvState == null) {
	@@ -1178,7 +1179,7 @@ class BassClientStateMachine extends StateMachine {
	.notifySourceAdded(		.notifySourceAdded(
	mDevice, recvState, BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);		mDevice, recvState, BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);
	if (mPendingMetadata != null) {		if (mPendingMetadata != null) {
	setCurrentBroadcastMetadata(recvState.getSourceId(), mPendingMetadata);		setCurrentBroadcastMetadata(sourceId, mPendingMetadata);
	mPendingMetadata = null;		mPendingMetadata = null;
	}		}
	checkAndUpdateBroadcastCode(recvState);		checkAndUpdateBroadcastCode(recvState);
	@@ -1224,28 +1225,28 @@ class BassClientStateMachine extends StateMachine {
	} else {		} else {
	log("update to an existing recvState");		log("update to an existing recvState");
	if (mPendingMetadata != null) {		if (mPendingMetadata != null) {
	setCurrentBroadcastMetadata(recvState.getSourceId(), mPendingMetadata);		setCurrentBroadcastMetadata(sourceId, mPendingMetadata);
	mPendingMetadata = null;		mPendingMetadata = null;
	}		}
	removeMessages(CANCEL_PENDING_SOURCE_OPERATION);		removeMessages(CANCEL_PENDING_SOURCE_OPERATION);
	mService.getCallbacks()		mService.getCallbacks()
	.notifySourceModified(		.notifySourceModified(
	mDevice,		mDevice,
	recvState.getSourceId(),		sourceId,
	BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);		BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);
	checkAndUpdateBroadcastCode(recvState);		checkAndUpdateBroadcastCode(recvState);
	processPASyncState(recvState);		processPASyncState(recvState);
	processSyncStateChangeStats(recvState);		processSyncStateChangeStats(recvState);

	if (isPendingRemove(recvState.getSourceId())) {		if (isPendingRemove(sourceId) && !isSyncedToTheSource(sourceId)) {
	Message message = obtainMessage(REMOVE_BCAST_SOURCE);		Message message = obtainMessage(REMOVE_BCAST_SOURCE);
	message.arg1 = recvState.getSourceId();		message.arg1 = sourceId;
	sendMessage(message);		sendMessage(message);
	}		}
	}		}
	}		}
	}		}
	broadcastReceiverState(recvState, recvState.getSourceId());		broadcastReceiverState(recvState, sourceId);
	}		}

	// Implements callback methods for GATT events that the app cares about.		// Implements callback methods for GATT events that the app cares about.

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientStateMachineTest.java

+54 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2701,6 +2701,60 @@ public class BassClientStateMachineTest {
	assertThat(mBassClientStateMachine.mPendingSourceId).isEqualTo(sourceId);		assertThat(mBassClientStateMachine.mPendingSourceId).isEqualTo(sourceId);
	}		}

			@Test
			public void updateBroadcastSource_pendingSourceToRemove() {
			prepareInitialReceiveStateForGatt();

			generateBroadcastReceiveStatesAndVerify(
			mSourceTestDevice,
			TEST_SOURCE_ID,
			BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED,
			BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_DECRYPTING,
			0x1L);

			BassClientStateMachine.BluetoothGattTestableWrapper btGatt =
			Mockito.mock(BassClientStateMachine.BluetoothGattTestableWrapper.class);
			mBassClientStateMachine.mBluetoothGatt = btGatt;
			BluetoothGattCharacteristic scanControlPoint =
			Mockito.mock(BluetoothGattCharacteristic.class);
			mBassClientStateMachine.mBroadcastScanControlPoint = scanControlPoint;

			BluetoothLeBroadcastMetadata metadata = createBroadcastMetadata();
			mBassClientStateMachine.mPendingMetadata = metadata;

			sendMessageAndVerifyTransition(
			mBassClientStateMachine.obtainMessage(
			UPDATE_BCAST_SOURCE,
			TEST_SOURCE_ID,
			BassConstants.PA_SYNC_DO_NOT_SYNC,
			metadata),
			BassClientStateMachine.ConnectedProcessing.class);
			assertThat(mBassClientStateMachine.mPendingOperation).isEqualTo(UPDATE_BCAST_SOURCE);
			assertThat(mBassClientStateMachine.mPendingSourceId).isEqualTo(TEST_SOURCE_ID);

			mBassClientStateMachine.mPendingOperation = 0;
			mBassClientStateMachine.mPendingSourceId = 0;
			// Verify not removing source when PA is still synced
			generateBroadcastReceiveStatesAndVerify(
			mSourceTestDevice,
			TEST_SOURCE_ID,
			BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED,
			BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,
			0x0L);
			assertThat(mBassClientStateMachine.mPendingOperation).isEqualTo(0);
			assertThat(mBassClientStateMachine.mPendingSourceId).isEqualTo(0);

			// Verify removing source when PA is unsynced
			generateBroadcastReceiveStatesAndVerify(
			mSourceTestDevice,
			TEST_SOURCE_ID,
			BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_IDLE,
			BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,
			0x0L);
			assertThat(mBassClientStateMachine.mPendingOperation).isEqualTo(REMOVE_BCAST_SOURCE);
			assertThat(mBassClientStateMachine.mPendingSourceId).isEqualTo(TEST_SOURCE_ID);
			}

	private void initToConnectingState() {		private void initToConnectingState() {
	allowConnection(true);		allowConnection(true);
	allowConnectGatt(true);		allowConnectGatt(true);