Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336c9135 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Remove intdef usage that block bluetooth apex" am: b72b351d am: f81fe1cf 

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

Change-Id: I654611d62cc38517165923724c098b5e6ec7f941
parents 027d32db f81fe1cf

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

+2 −3
Original line number Diff line number Diff line
@@ -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;

        }