drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove intdef usage that block bluetooth apex" am: b72b351d21 am: f81fe1cfb7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988587

Change-Id: I654611d62cc38517165923724c098b5e6ec7f941
This commit is contained in:
William Escande 2022-02-16 22:57:32 +00:00 committed by Automerger Merge Worker
commit 336c9135df
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java
View File

@ -69,7 +69,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto
}
@Implementation
protected boolean removeActiveDevice(@BluetoothAdapter.ActiveDeviceUse int profiles) {
protected boolean removeActiveDevice(int profiles) {
if (profiles != ACTIVE_DEVICE_AUDIO && profiles != ACTIVE_DEVICE_PHONE_CALL
&& profiles != ACTIVE_DEVICE_ALL) {
return false;
@ -78,8 +78,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto
}
@Implementation
protected boolean setActiveDevice(BluetoothDevice device,
@BluetoothAdapter.ActiveDeviceUse int profiles) {
protected boolean setActiveDevice(BluetoothDevice device, int profiles) {
if (device == null) {
return false;
}