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

Commit 533c10f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid... 

Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e813

Change-Id: I3ab6b4458babf1bfd43c89fb74ae451cf05f9022
parents d1cd033f 1ed4e813

src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ public class HandsFreeProfileOutputPreferenceController extends AudioSwitchPrefe 
        if (hapProfile != null && hfpProfile != null && device == null) {

            hfpProfile.setActiveDevice(null);

            hapProfile.setActiveDevice(null);

        } else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {

        } else if (hapProfile != null && device != null

                && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {

            hapProfile.setActiveDevice(device);

        } else if (hfpProfile != null) {

            hfpProfile.setActiveDevice(device);