commit 290f90bfaa8f5c4314ee50ebcbc3f420d86cbf89
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 25 13:53:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 25 13:53:10 2020 +0000
tree bb72c3af3c92889b2bae1731035d2fabecbd56f6
parent 60226078df1ceedd0c9136ccf69f9286c87110b7
parent f07ee55a4abb1ff48255417bf7fd898af303e0a9

Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" into rvc-dev am: 32ec718cfa am: f07ee55a4a

Change-Id: I0c7c481bb49d7d942fb4652bda7842c449ae3631

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

diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index d72f503..d9d8737 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -171,7 +171,8 @@
         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);