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

Merge "Fix incorrect API invoke for BT profiles" am: 625c1eeaa9

Browse Source 
am: dbc26b576c

Change-Id: Ic6b7a4b7541310b3a635b94a799e3476cf5cc684
This commit is contained in:
Lei Yu
2018-09-21 13:20:16 -07:00
committed by android-build-merger
parent 7c6679fac0 dbc26b576c
commit 6ef05a6c23
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,12 +100,9 @@ public class HandsFreeProfileOutputPreferenceController extends
if (hapProfile != null && hfpProfile != null && device == null) {
hfpProfile.setActiveDevice(null);
hapProfile.setActiveDevice(null);
return;
}
if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
} else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
hapProfile.setActiveDevice(device);
}
if (hfpProfile != null) {
} else if (hfpProfile != null) {
hfpProfile.setActiveDevice(device);
}
}

7
src/com/android/settings/sound/MediaOutputPreferenceController.java
View File

@@ -112,12 +112,9 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
if (hapProfile != null && a2dpProfile != null && device == null) {
hapProfile.setActiveDevice(null);
a2dpProfile.setActiveDevice(null);
return;
}
if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
} else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
hapProfile.setActiveDevice(device);
}
if (a2dpProfile != null) {
} else if (a2dpProfile != null) {
a2dpProfile.setActiveDevice(device);
}
}