Merge "Do not return null as active device" (1e33487f) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -860,6 +860,7 @@ public class AdapterService extends Service {
		errorLog(
		"Cannot switch buffer size. The number of A2DP active devices is "
		+ activeDevices.size());
		return;
		}
		mA2dpService.switchCodecByBufferSize(activeDevices.get(0), isLowLatencyBufferSize);
		}
		@@ -4100,16 +4101,22 @@ public class AdapterService extends Service {
		if (mHeadsetService == null) {
		Log.e(TAG, "getActiveDevices: HeadsetService is null");
		} else {
		activeDevices.add(mHeadsetService.getActiveDevice());
		Log.i(TAG, "getActiveDevices: Headset device: " + activeDevices.get(0));
		BluetoothDevice device = mHeadsetService.getActiveDevice();
		if (device != null) {
		activeDevices.add(device);
		}
		Log.i(TAG, "getActiveDevices: Headset device: " + device);
		}
		break;
		case BluetoothProfile.A2DP:
		if (mA2dpService == null) {
		Log.e(TAG, "getActiveDevices: A2dpService is null");
		} else {
		activeDevices.add(mA2dpService.getActiveDevice());
		Log.i(TAG, "getActiveDevices: A2dp device: " + activeDevices.get(0));
		BluetoothDevice device = mA2dpService.getActiveDevice();
		if (device != null) {
		activeDevices.add(device);
		}
		Log.i(TAG, "getActiveDevices: A2dp device: " + device);
		}
		break;
		case BluetoothProfile.HEARING_AID: