Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feca91c0 authored by Grace Jia's avatar Grace Jia Committed by Tyler Gunn
Browse files

Fix crash prone code in BluetoothDeviceManager. 

Bug: 237751446
Bug: 240215018
Test: BluetoothDeviceManagerTest
Merged-In: I722dded7744759f4485407d5f12e3a57d23b5fbf
Change-Id: I722dded7744759f4485407d5f12e3a57d23b5fbf
parent 054514cb

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;
@@ -425,8 +426,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) {

            mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());

            mAudioManager.clearCommunicationDevice();
@@ -442,8 +444,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();

        }