Snap for 8852680 from 20c9967a75392c648c9c224d1bddbc05bc886452 to tm-qpr1-release (e1f83459) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java

+22 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothGatt;
		import android.bluetooth.BluetoothGattCallback;
		import android.bluetooth.BluetoothGattCharacteristic;
		import android.bluetooth.BluetoothGattDescriptor;
		import android.bluetooth.BluetoothGattService;
		import android.bluetooth.BluetoothProfile;
		import android.os.Looper;
		@@ -51,9 +52,10 @@ public class BatteryStateMachine extends StateMachine {

		static final UUID GATT_BATTERY_SERVICE_UUID =
		UUID.fromString("0000180f-0000-1000-8000-00805f9b34fb");

		static final UUID GATT_BATTERY_LEVEL_CHARACTERISTIC_UUID =
		UUID.fromString("00002a19-0000-1000-8000-00805f9b34fb");
		static final UUID CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID =
		UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");

		static final int CONNECT = 1;
		static final int DISCONNECT = 2;
		@@ -553,7 +555,8 @@ public class BatteryStateMachine extends StateMachine {
		return;
		}

		gatt.setCharacteristicNotification(batteryLevel, /enable=/true);
		// This may not trigger onCharacteristicRead if CCCD is already set but then
		// onCharacteristicChanged will be triggered soon.
		gatt.readCharacteristic(batteryLevel);
		}

		@@ -575,6 +578,23 @@ public class BatteryStateMachine extends StateMachine {

		if (GATT_BATTERY_LEVEL_CHARACTERISTIC_UUID.equals(characteristic.getUuid())) {
		updateBatteryLevel(value);
		BluetoothGattDescriptor cccd =
		characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID);
		if (cccd != null) {
		gatt.setCharacteristicNotification(characteristic, /enable=/true);
		gatt.writeDescriptor(cccd, BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
		} else {
		Log.w(TAG, "No CCCD for battery level characteristic, "
		+ "it won't be notified");
		}
		}
		}

		@Override
		public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,
		int status) {
		if (status != BluetoothGatt.GATT_SUCCESS) {
		Log.w(TAG, "Failed to write descriptor " + descriptor.getUuid());
		}
		}

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ import com.android.bluetooth.btservice.ProfileService;
		import com.android.bluetooth.btservice.storage.DatabaseManager;
		import com.android.internal.annotations.VisibleForTesting;

		import java.nio.ByteBuffer;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.HashMap;
		@@ -186,8 +185,8 @@ public class BassClientService extends ProfileService {
		}

		void setActiveSyncedSource(BluetoothDevice scanDelegator, BluetoothDevice sourceDevice) {
		log("setActiveSyncedSource: scanDelegator" + scanDelegator
		+ ":: sourceDevice:" + sourceDevice);
		log("setActiveSyncedSource, scanDelegator: " + scanDelegator + ", sourceDevice: " +
		sourceDevice);
		if (sourceDevice == null) {
		mActiveSourceMap.remove(scanDelegator);
		} else {
		@@ -399,8 +398,8 @@ public class BassClientService extends ProfileService {
		Log.e(TAG, "connect: device is null");
		return false;
		}
		if (getConnectionPolicy(device) == BluetoothProfile.CONNECTION_POLICY_UNKNOWN) {
		Log.e(TAG, "connect: unknown connection policy");
		if (getConnectionPolicy(device) == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {
		Log.e(TAG, "connect: connection policy set to forbidden");
		return false;
		}
		synchronized (mStateMachines) {
		@@ -860,8 +859,11 @@ public class BassClientService extends ProfileService {
		BassClientStateMachine.UPDATE_BCAST_SOURCE);
		message.arg1 = sourceId;
		message.arg2 = BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_IDLE;
		/* Pending remove set. Remove source once not synchronized to PA */
		message.obj = metaData;
		stateMachine.sendMessage(message);

		return;
		}
		Message message = stateMachine.obtainMessage(BassClientStateMachine.REMOVE_BCAST_SOURCE);
		message.arg1 = sourceId;

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

+84 −29

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.io.StringWriter;
		import java.nio.ByteBuffer;
		import java.nio.ByteOrder;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		@@ -171,6 +172,7 @@ public class BassClientStateMachine extends StateMachine {
		private BluetoothLeBroadcastMetadata mPendingMetadata = null;
		private BluetoothLeBroadcastReceiveState mSetBroadcastPINRcvState = null;
		private boolean mSetBroadcastCodePending = false;
		private final Map<Integer, Boolean> mPendingRemove = new HashMap();
		// Psync and PAST interfaces
		private PeriodicAdvertisingManager mPeriodicAdvManager;
		private boolean mAutoAssist = false;
		@@ -243,6 +245,7 @@ public class BassClientStateMachine extends StateMachine {
		mPendingSourceId = -1;
		mPendingMetadata = null;
		mCurrentMetadata.clear();
		mPendingRemove.clear();
		}

		Boolean hasPendingSourceOperation() {
		@@ -262,6 +265,18 @@ public class BassClientStateMachine extends StateMachine {
		}
		}

		boolean isPendingRemove(Integer sourceId) {
		return mPendingRemove.getOrDefault(sourceId, false);
		}

		private void setPendingRemove(Integer sourceId, boolean remove) {
		if (remove) {
		mPendingRemove.put(sourceId, remove);
		} else {
		mPendingRemove.remove(sourceId);
		}
		}

		BluetoothLeBroadcastReceiveState getBroadcastReceiveStateForSourceDevice(
		BluetoothDevice srcDevice) {
		List<BluetoothLeBroadcastReceiveState> currentSources = getAllSources();
		@@ -350,9 +365,9 @@ public class BassClientStateMachine extends StateMachine {
		mPASyncRetryCounter = 1;
		// Cache Scan res for Retrys
		mScanRes = scanRes;
		/*This is an override case
		if Previous sync is still active, cancel It
		But don't stop the Scan offload as we still trying to assist remote*/
		/*This is an override case if Previous sync is still active, cancel It, but don't stop the
		* Scan offload as we still trying to assist remote
		*/
		mNoStopScanOffload = true;
		cancelActiveSync(null);
		try {
		@@ -389,16 +404,10 @@ public class BassClientStateMachine extends StateMachine {

		private void cancelActiveSync(BluetoothDevice sourceDev) {
		log("cancelActiveSync");
		boolean isCancelSyncNeeded = false;
		BluetoothDevice activeSyncedSrc = mService.getActiveSyncedSource(mDevice);
		if (activeSyncedSrc != null) {
		if (sourceDev == null) {
		isCancelSyncNeeded = true;
		} else if (activeSyncedSrc.equals(sourceDev)) {
		isCancelSyncNeeded = true;
		}
		}
		if (isCancelSyncNeeded) {

		/* Stop sync if there is some running */
		if (activeSyncedSrc != null && (sourceDev == null \|\| activeSyncedSrc.equals(sourceDev))) {
		removeMessages(PSYNC_ACTIVE_TIMEOUT);
		try {
		log("calling unregisterSync");
		@@ -477,11 +486,12 @@ public class BassClientStateMachine extends StateMachine {
		int skip,
		int timeout,
		int status) {
		log("onSyncEstablished syncHandle" + syncHandle
		+ "device" + device
		+ "advertisingSid" + advertisingSid
		+ "skip" + skip + "timeout" + timeout
		+ "status" + status);
		log("onSyncEstablished syncHandle: " + syncHandle
		+ ", device: " + device
		+ ", advertisingSid: " + advertisingSid
		+ ", skip: " + skip
		+ ", timeout: " + timeout
		+ ", status: " + status);
		if (status == BluetoothGatt.GATT_SUCCESS) {
		// updates syncHandle, advSid
		mService.updatePeriodicAdvertisementResultMap(
		@@ -495,7 +505,7 @@ public class BassClientStateMachine extends StateMachine {
		BassConstants.PSYNC_ACTIVE_TIMEOUT_MS);
		mService.setActiveSyncedSource(mDevice, device);
		} else {
		log("failed to sync to PA" + mPASyncRetryCounter);
		log("failed to sync to PA: " + mPASyncRetryCounter);
		mScanRes = null;
		if (!mAutoTriggered) {
		Message message = obtainMessage(STOP_SCAN_OFFLOAD);
		@@ -565,7 +575,7 @@ public class BassClientStateMachine extends StateMachine {
		& (~BassConstants.ADV_ADDRESS_DONT_MATCHES_EXT_ADV_ADDRESS);
		serviceData = serviceData
		& (~BassConstants.ADV_ADDRESS_DONT_MATCHES_SOURCE_ADV_ADDRESS);
		log("Initiate PAST for :" + mDevice + "syncHandle:" + syncHandle
		log("Initiate PAST for: " + mDevice + ", syncHandle: " + syncHandle
		+ "serviceData" + serviceData);
		mPeriodicAdvManager.transferSync(mDevice, serviceData, syncHandle);
		}
		@@ -592,10 +602,17 @@ public class BassClientStateMachine extends StateMachine {
		&& mSetBroadcastCodePending) {
		log("Update the Broadcast now");
		Message m = obtainMessage(BassClientStateMachine.SET_BCAST_CODE);

		/* Use cached receiver state if previousely didn't finished setting broadcast code or
		* use current receiver state if this is a first check and update
		*/
		if (mSetBroadcastPINRcvState != null) {
		m.obj = mSetBroadcastPINRcvState;
		} else {
		m.obj = recvState;
		}

		sendMessage(m);
		mSetBroadcastCodePending = false;
		mSetBroadcastPINRcvState = null;
		}
		}

		@@ -677,10 +694,7 @@ public class BassClientStateMachine extends StateMachine {
		System.arraycopy(receiverState, offset, audioSyncIndex, 0,
		BassConstants.BCAST_RCVR_STATE_BIS_SYNC_SIZE);
		offset += BassConstants.BCAST_RCVR_STATE_BIS_SYNC_SIZE;
		log("BIS index byte array: ");
		BassUtils.printByteArray(audioSyncIndex);
		ByteBuffer wrapped = ByteBuffer.wrap(audioSyncIndex);
		audioSyncState.add((long) wrapped.getInt());
		audioSyncState.add((long) Utils.byteArrayToInt(audioSyncIndex));

		byte metaDataLength = receiverState[offset++];
		if (metaDataLength > 0) {
		@@ -726,6 +740,18 @@ public class BassClientStateMachine extends StateMachine {
		numSubGroups,
		audioSyncState,
		metadataList);
		log("Receiver state: " +
		"\n\tSource ID: " + sourceId +
		"\n\tSource Address Type: " + (int) sourceAddressType +
		"\n\tDevice: " + device +
		"\n\tSource Adv SID: " + sourceAdvSid +
		"\n\tBroadcast ID: " + broadcastId +
		"\n\tMetadata Sync State: " + (int) metaDataSyncState +
		"\n\tEncryption Status: " + (int) encryptionStatus +
		"\n\tBad Broadcast Code: " + badBroadcastCode +
		"\n\tNumber Of Subgroups: " + numSubGroups +
		"\n\tAudio Sync State: " + audioSyncState +
		"\n\tMetadata: " + metadataList);
		}
		return recvState;
		}
		@@ -783,6 +809,12 @@ public class BassClientStateMachine extends StateMachine {
		recvState.getSourceId(), BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);
		checkAndUpdateBroadcastCode(recvState);
		processPASyncState(recvState);

		if (isPendingRemove(recvState.getSourceId())) {
		Message message = obtainMessage(REMOVE_BCAST_SOURCE);
		message.arg1 = recvState.getSourceId();
		sendMessage(message);
		}
		}
		}
		}
		@@ -998,6 +1030,7 @@ public class BassClientStateMachine extends StateMachine {
		mPendingOperation = -1;
		mPendingMetadata = null;
		mCurrentMetadata.clear();
		mPendingRemove.clear();
		}

		@VisibleForTesting
		@@ -1239,6 +1272,16 @@ public class BassClientStateMachine extends StateMachine {
		stream.write(metadata.getRawMetadata(), 0, metadata.getRawMetadata().length);
		}

		if (metaData.isEncrypted() && metaData.getBroadcastCode().length == 16) {
		if (metaData.getBroadcastCode().length != 16) {
		Log.e(TAG, "Delivered invalid length of broadcast code: " +
		metaData.getBroadcastCode().length + ", should be 16");
		return null;
		}

		mSetBroadcastCodePending = true;
		}

		byte[] res = stream.toByteArray();
		log("ADD_BCAST_SOURCE in Bytes");
		BassUtils.printByteArray(res);
		@@ -1508,6 +1551,9 @@ public class BassClientStateMachine extends StateMachine {
		mBluetoothGatt.writeCharacteristic(mBroadcastScanControlPoint);
		mPendingOperation = message.what;
		mPendingSourceId = (byte) sourceId;
		if (paSync == BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_IDLE) {
		setPendingRemove(sourceId, true);
		}
		mPendingMetadata = metaData;
		transitionTo(mConnectedProcessing);
		sendMessageDelayed(GATT_TXN_TIMEOUT, BassConstants.GATT_TXN_TIMEOUT_MS);
		@@ -1540,17 +1586,22 @@ public class BassClientStateMachine extends StateMachine {
		mPendingSourceId = (byte) recvState.getSourceId();
		transitionTo(mConnectedProcessing);
		sendMessageDelayed(GATT_TXN_TIMEOUT, BassConstants.GATT_TXN_TIMEOUT_MS);
		mSetBroadcastCodePending = false;
		mSetBroadcastPINRcvState = null;
		}
		}
		break;
		case REMOVE_BCAST_SOURCE:
		byte sid = (byte) message.arg1;
		log("Removing Broadcast source: audioSource:" + "sourceId:"
		+ sid);
		log("Removing Broadcast source, sourceId: " + sid);
		byte[] removeSourceInfo = new byte[2];
		removeSourceInfo[0] = OPCODE_REMOVE_SOURCE;
		removeSourceInfo[1] = sid;
		if (mBluetoothGatt != null && mBroadcastScanControlPoint != null) {
		if (isPendingRemove((int) sid)) {
		setPendingRemove((int) sid, false);
		}

		mBroadcastScanControlPoint.setValue(removeSourceInfo);
		mBluetoothGatt.writeCharacteristic(mBroadcastScanControlPoint);
		mPendingOperation = message.what;
		@@ -1645,7 +1696,11 @@ public class BassClientStateMachine extends StateMachine {
		}
		@Override
		public void exit() {
		/* Pending Metadata will be used to bond with source ID in receiver state notify */
		if (mPendingOperation == REMOVE_BCAST_SOURCE) {
		mPendingMetadata = null;
		}

		log("Exit ConnectedProcessing(" + mDevice + "): "
		+ messageWhatToString(getCurrentMessage().what));
		}

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

+114 −114

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -126,6 +126,10 @@ public class BassClientServiceTest {

		@After
		public void tearDown() throws Exception {
		if (mBassClientService == null) {
		return;
		}

		TestUtils.stopService(mServiceRule, BassClientService.class);
		mBassClientService = BassClientService.getBassClientService();
		assertThat(mBassClientService).isNull();
		@@ -197,14 +201,14 @@ public class BassClientServiceTest {
		}

		/**
		* Test connecting to a device when the connection policy is unknown.
		* Test connecting to a device when the connection policy is forbidden.
		* - service.connect() should return false.
		*/
		@Test
		public void testConnect_whenConnectionPolicyIsUnknown() {
		public void testConnect_whenConnectionPolicyIsForbidden() {
		when(mDatabaseManager.getProfileConnectionPolicy(any(BluetoothDevice.class),
		eq(BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT)))
		.thenReturn(BluetoothProfile.CONNECTION_POLICY_UNKNOWN);
		.thenReturn(BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
		mCurrentDevice = TestUtils.getTestDevice(mBluetoothAdapter, 0);
		assertThat(mCurrentDevice).isNotNull();