PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-25 13:35:10 +00:00
committed by Android (Google) Code Review
parent 49bc53ec0a 5bce75f0fb
commit 32ec718cfa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
View File

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