Merge "Tbs: Fix error handling for the join call" into tm-qpr-dev (a2d2433c) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/tbs/TbsGeneric.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -841,6 +841,7 @@ public class TbsGeneric {

	Map.Entry<UUID, Bearer> firstEntry = null;		Map.Entry<UUID, Bearer> firstEntry = null;
	List<ParcelUuid> parcelUuids = new ArrayList<>();		List<ParcelUuid> parcelUuids = new ArrayList<>();
			result = TbsGatt.CALL_CONTROL_POINT_RESULT_SUCCESS;
	for (int callIndex : args) {		for (int callIndex : args) {
	Map.Entry<UUID, Bearer> entry = getCallIdByIndex(callIndex);		Map.Entry<UUID, Bearer> entry = getCallIdByIndex(callIndex);
	if (entry == null) {		if (entry == null) {
	@@ -864,6 +865,10 @@ public class TbsGeneric {
	parcelUuids.add(new ParcelUuid(entry.getKey()));		parcelUuids.add(new ParcelUuid(entry.getKey()));
	}		}

			if (result != TbsGatt.CALL_CONTROL_POINT_RESULT_SUCCESS) {
			break;
			}

	Bearer bearer = firstEntry.getValue();		Bearer bearer = firstEntry.getValue();
	Request request = new Request(device, parcelUuids, opcode, args[0]);		Request request = new Request(device, parcelUuids, opcode, args[0]);
	int requestId = mLastRequestIdAssigned + 1;		int requestId = mLastRequestIdAssigned + 1;