Merge "Fix crash prone code in BluetoothDeviceManager." (6a1a54a9) · Commits · e / os / android_packages_services_Telecomm

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

+7 −4

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;

		@@ -433,8 +434,9 @@ public class BluetoothDeviceManager {
		Log.i(this, "clearLeAudioCommunicationDevice: mAudioManager is null");
		return;
		}
		if (mAudioManager.getCommunicationDevice() != null
		&& mAudioManager.getCommunicationDevice().getType()

		AudioDeviceInfo audioDeviceInfo = mAudioManager.getCommunicationDevice();
		if (audioDeviceInfo != null && audioDeviceInfo.getType()
		== AudioDeviceInfo.TYPE_BLE_HEADSET) {
		mAudioManager.clearCommunicationDevice();
		}
		@@ -449,8 +451,9 @@ public class BluetoothDeviceManager {
		Log.i(this, "clearHearingAidCommunicationDevice: mAudioManager is null");
		return;
		}
		if (mAudioManager.getCommunicationDevice() != null
		&& mAudioManager.getCommunicationDevice().getType()

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