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

Fix incorrect API invoke for BT profiles

Browse Source 
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()

Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes: 113625278
Test: RunSettingsRoboTests
This commit is contained in:
jackqdyulei
2018-09-18 15:07:49 -07:00
parent e5791f3c99
commit 1bf730093c
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

@@ -93,12 +93,9 @@ public class HandsFreeProfileOutputPreferenceController extends
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);
return; } else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
}
if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
hapProfile.setActiveDevice(device); hapProfile.setActiveDevice(device);
} } else if (hfpProfile != null) {
if (hfpProfile != null) {
hfpProfile.setActiveDevice(device); hfpProfile.setActiveDevice(device);
} }
} }

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

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

3
tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
View File

@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -179,6 +180,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest {
mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice); mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);
verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice); verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);
verify(mHeadsetProfile, never()).setActiveDevice(mLeftBluetoothHapDevice);
} }
/** /**
@@ -192,6 +194,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest {
mController.setActiveBluetoothDevice(mBluetoothDevice); mController.setActiveBluetoothDevice(mBluetoothDevice);
verify(mHeadsetProfile).setActiveDevice(mBluetoothDevice); verify(mHeadsetProfile).setActiveDevice(mBluetoothDevice);
verify(mHearingAidProfile, never()).setActiveDevice(mBluetoothDevice);
} }
/** /**

3
tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
View File

@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -180,6 +181,7 @@ public class MediaOutputPreferenceControllerTest {
mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice); mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);
verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice); verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);
verify(mA2dpProfile, never()).setActiveDevice(mLeftBluetoothHapDevice);
} }
/** /**
@@ -193,6 +195,7 @@ public class MediaOutputPreferenceControllerTest {
mController.setActiveBluetoothDevice(mBluetoothDevice); mController.setActiveBluetoothDevice(mBluetoothDevice);
verify(mA2dpProfile).setActiveDevice(mBluetoothDevice); verify(mA2dpProfile).setActiveDevice(mBluetoothDevice);
verify(mHearingAidProfile, never()).setActiveDevice(mBluetoothDevice);
} }
/** /**