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

Commit 2404b64f authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add null check" am: 54396339 

am: b9521160

Change-Id: I09c359c2f474eae1faf1ce42dc533c2ccfae5c55
parents ec4d8d9b b9521160

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

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ public class BluetoothDeviceManager { 
        synchronized (mLock) {

            LinkedHashMap<String, BluetoothDevice> targetDeviceMap;

            if (isHearingAid) {

                if (mBluetoothHearingAidService == null) {

                    Log.w(this, "Hearing aid service null when receiving device added broadcast");

                    return;

                }

                long hiSyncId = mBluetoothHearingAidService.getHiSyncId(device);

                mHearingAidDeviceSyncIds.put(device, hiSyncId);

                targetDeviceMap = mHearingAidDevicesByAddress;