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 am: 32ec718cfa am: f07ee55a4a am: 290f90bfaa

Browse Source 
Change-Id: I56742e79a1ecd7587c557907825defce6b26628e
This commit is contained in:
TreeHugger Robot
2020-03-25 13:53:30 +00:00
committed by Automerger Merge Worker
parent 6dc994b979 290f90bfaa
commit 29d2b7fe2b
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) { if (hapProfile != null && hfpProfile != null && device == null) {
hfpProfile.setActiveDevice(null); hfpProfile.setActiveDevice(null);
hapProfile.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); hapProfile.setActiveDevice(device);
} else if (hfpProfile != null) { } else if (hfpProfile != null) {
hfpProfile.setActiveDevice(device); hfpProfile.setActiveDevice(device);