From a877bd488feb2e637a6e6d9c6f7bec741cbfcf2b Mon Sep 17 00:00:00 2001 From: William Escande Date: Wed, 16 Feb 2022 17:13:08 +0100 Subject: [PATCH] Remove intdef usage that block bluetooth apex Test: pre-submit Change-Id: I932cea4b02bbc8e43d5d373ba2a3305322032104 Bug: 217736913 --- .../settingslib/testutils/shadow/ShadowBluetoothAdapter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java index 3b7fbc73522f..c7e96bcdb856 100644 --- a/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java +++ b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java @@ -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; }