Merge "DO NOT MERGE Disable Le Audio communication flag before notifying audio... (49ea80b7) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -421,10 +421,9 @@ public class BluetoothDeviceManager {
	if (!mLeAudioSetAsCommunicationDevice) {		if (!mLeAudioSetAsCommunicationDevice) {
	return;		return;
	}		}
			mLeAudioSetAsCommunicationDevice = false;
	if (mAudioManager == null) {		if (mAudioManager == null) {
	Log.i(this, "clearLeAudioCommunicationDevice: mAudioManager is null");		Log.i(this, "clearLeAudioCommunicationDevice: mAudioManager is null");
	mLeAudioSetAsCommunicationDevice = false;
	return;		return;
	}		}

	@@ -442,10 +441,10 @@ public class BluetoothDeviceManager {
	if (!mHearingAidSetAsCommunicationDevice) {		if (!mHearingAidSetAsCommunicationDevice) {
	return;		return;
	}		}
			mHearingAidSetAsCommunicationDevice = false;
	if (mAudioManager == null) {		if (mAudioManager == null) {
	Log.i(this, "clearHearingAidCommunicationDevice: mAudioManager is null");		Log.i(this, "clearHearingAidCommunicationDevice: mAudioManager is null");
	mHearingAidSetAsCommunicationDevice = false;		return;
	}		}

	AudioDeviceInfo audioDeviceInfo = mAudioManager.getCommunicationDevice();		AudioDeviceInfo audioDeviceInfo = mAudioManager.getCommunicationDevice();