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

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

Change-Id: I688c605a1cfbe77874148cc1df278c5d4ac0311a
This commit is contained in:
William Escande
2022-02-16 22:36:14 +00:00
committed by Automerger Merge Worker
parent a6e485df70 b72b351d21
commit f81fe1cfb7
1 changed files with 2 additions and 3 deletions
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 @Implementation
protected boolean removeActiveDevice(@BluetoothAdapter.ActiveDeviceUse int profiles) { protected boolean removeActiveDevice(int profiles) {
if (profiles != ACTIVE_DEVICE_AUDIO && profiles != ACTIVE_DEVICE_PHONE_CALL if (profiles != ACTIVE_DEVICE_AUDIO && profiles != ACTIVE_DEVICE_PHONE_CALL
&& profiles != ACTIVE_DEVICE_ALL) { && profiles != ACTIVE_DEVICE_ALL) {
return false; return false;
@@ -78,8 +78,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto
} }
@Implementation @Implementation
protected boolean setActiveDevice(BluetoothDevice device, protected boolean setActiveDevice(BluetoothDevice device, int profiles) {
@BluetoothAdapter.ActiveDeviceUse int profiles) {
if (device == null) { if (device == null) {
return false; return false;
} }