Merge "Fix crash prone code in BluetoothDeviceManager." into tm-qpr-dev (61030515) · Commits · e / os / android_packages_services_Telecomm

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.bluetooth.BluetoothStatusCodes;
		import android.content.Context;
		import android.media.AudioManager;
		import android.media.AudioDeviceInfo;
		import android.media.audio.common.AudioDevice;
		import android.telecom.Log;
		import android.util.LocalLog;

		@@ -426,10 +427,11 @@ public class BluetoothDeviceManager {
		mLeAudioSetAsCommunicationDevice = false;
		return;
		}
		if (mAudioManager.getCommunicationDevice() != null
		&& mAudioManager.getCommunicationDevice().getType()

		AudioDeviceInfo audioDeviceInfo = mAudioManager.getCommunicationDevice();
		if (audioDeviceInfo != null && audioDeviceInfo.getType()
		== AudioDeviceInfo.TYPE_BLE_HEADSET) {
		mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());
		mBluetoothRouteManager.onAudioLost(audioDeviceInfo.getAddress());
		mAudioManager.clearCommunicationDevice();
		mLeAudioSetAsCommunicationDevice = false;
		}
		@@ -444,8 +446,9 @@ public class BluetoothDeviceManager {
		Log.i(this, "clearHearingAidCommunicationDevice: mAudioManager is null");
		mHearingAidSetAsCommunicationDevice = false;
		}
		if (mAudioManager.getCommunicationDevice() != null
		&& mAudioManager.getCommunicationDevice().getType()

		AudioDeviceInfo audioDeviceInfo = mAudioManager.getCommunicationDevice();
		if (audioDeviceInfo != null && audioDeviceInfo.getType()
		== AudioDeviceInfo.TYPE_HEARING_AID) {
		mAudioManager.clearCommunicationDevice();
		mHearingAidSetAsCommunicationDevice = false;