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

Commit 32ec718c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" into rvc-dev
parents 49bc53ec 5bce75f0

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);