diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 5ffa8cf78da..462f422a56c 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -47,7 +47,7 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController @Override public boolean isAvailable() { - boolean hasLeAudio = mCachedDevice.getConnectableProfiles() + boolean hasLeAudio = mCachedDevice.getUiAccessibleProfiles() .stream() .anyMatch(profile -> profile.getProfileId() == BluetoothProfile.LE_AUDIO); return !BluetoothUtils.isAdvancedDetailsHeader(mCachedDevice.getDevice()) && !hasLeAudio; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index 50c908d2fa2..2b746842ad6 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -314,7 +314,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll return result; } for (CachedBluetoothDevice cachedItem : mAllOfCachedDevices) { - List tmpResult = cachedItem.getConnectableProfiles(); + List tmpResult = cachedItem.getUiAccessibleProfiles(); for (LocalBluetoothProfile profile : tmpResult) { if (mProfileDeviceMap.containsKey(profile.toString())) { mProfileDeviceMap.get(profile.toString()).add(cachedItem); diff --git a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java index a64874d3260..4be4d63d7c3 100644 --- a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java @@ -107,7 +107,7 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr if (mCachedDevice == null || mProfileManager == null) { return CONDITIONALLY_UNAVAILABLE; } - boolean hasLeAudio = mCachedDevice.getConnectableProfiles() + boolean hasLeAudio = mCachedDevice.getUiAccessibleProfiles() .stream() .anyMatch(profile -> profile.getProfileId() == BluetoothProfile.LE_AUDIO); diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java index a0c0b44a888..d6ad4bc3c7b 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java @@ -437,7 +437,7 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro } private boolean isMediaDevice(CachedBluetoothDevice cachedDevice) { - return cachedDevice.getConnectableProfiles().stream() + return cachedDevice.getUiAccessibleProfiles().stream() .anyMatch( profile -> profile instanceof A2dpProfile diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 219c37b6c08..4f084a47a8b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -114,7 +114,7 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont setUpMockProfiles(); when(mCachedBluetoothDeviceManager.getCachedDevicesCopy()) .thenReturn(ImmutableList.of(mCachedDevice)); - when(mCachedDevice.getConnectableProfiles()) + when(mCachedDevice.getUiAccessibleProfiles()) .thenAnswer(invocation -> new ArrayList<>(mConnectableProfiles)); when(mCachedDevice.getProfiles()) .thenAnswer(invocation -> ImmutableList.of(mConnectableProfiles)); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java index f3f32ae4e31..03f13037d62 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java @@ -303,7 +303,7 @@ public class AudioSharingDevicePreferenceControllerTest { @Test public void onProfileConnectionStateChanged_notMediaDevice_doNothing() { - doReturn(ImmutableList.of()).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of()).when(mCachedDevice).getUiAccessibleProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, BluetoothAdapter.STATE_CONNECTED, BluetoothProfile.HID_DEVICE); verifyNoInteractions(mDialogHandler); @@ -313,7 +313,7 @@ public class AudioSharingDevicePreferenceControllerTest { public void onProfileConnectionStateChanged_leaDeviceDisconnected_closeOpeningDialogsForIt() { // Test when LEA device LE_AUDIO_BROADCAST_ASSISTANT disconnected. when(mDevice.isConnected()).thenReturn(true); - doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getUiAccessibleProfiles(); doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, @@ -325,7 +325,7 @@ public class AudioSharingDevicePreferenceControllerTest { @Test public void onProfileConnectionStateChanged_assistantProfileConnecting_doNothing() { // Test when LEA device LE_AUDIO_BROADCAST_ASSISTANT connecting - doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getUiAccessibleProfiles(); doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, @@ -338,7 +338,7 @@ public class AudioSharingDevicePreferenceControllerTest { public void onProfileConnectionStateChanged_otherProfileConnected_doNothing() { // Test when LEA device other profile connected when(mDevice.isConnected()).thenReturn(true); - doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getUiAccessibleProfiles(); doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, BluetoothAdapter.STATE_CONNECTED, BluetoothProfile.A2DP); @@ -349,7 +349,7 @@ public class AudioSharingDevicePreferenceControllerTest { public void onProfileConnectionStateChanged_otherProfileConnecting_doNothing() { // Test when LEA device other profile connecting when(mDevice.isConnected()).thenReturn(true); - doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getUiAccessibleProfiles(); doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, BluetoothAdapter.STATE_CONNECTING, BluetoothProfile.A2DP); @@ -360,7 +360,7 @@ public class AudioSharingDevicePreferenceControllerTest { public void onProfileConnectionStateChanged_assistantProfileConnected_handle() { // Test when LEA device LE_AUDIO_BROADCAST_ASSISTANT connected when(mDevice.isConnected()).thenReturn(true); - doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getUiAccessibleProfiles(); doReturn(ImmutableList.of(mLeAudioProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, @@ -374,7 +374,7 @@ public class AudioSharingDevicePreferenceControllerTest { onProfileConnectionStateChanged_nonLeaDeviceDisconnected_closeOpeningDialogsForIt() { // Test when non-LEA device totally disconnected when(mLeAudioProfile.isEnabled(mDevice)).thenReturn(false); - doReturn(ImmutableList.of(mA2dpProfile)).when(mCachedDevice).getConnectableProfiles(); + doReturn(ImmutableList.of(mA2dpProfile)).when(mCachedDevice).getUiAccessibleProfiles(); doReturn(ImmutableList.of(mLeAudioProfile, mA2dpProfile)).when(mCachedDevice).getProfiles(); when(mCachedDevice.isConnected()).thenReturn(false); mController.onProfileConnectionStateChanged( @@ -390,7 +390,7 @@ public class AudioSharingDevicePreferenceControllerTest { .thenReturn(BluetoothAdapter.STATE_CONNECTED); doReturn(ImmutableList.of(mA2dpProfile, mHeadsetProfile)) .when(mCachedDevice) - .getConnectableProfiles(); + .getUiAccessibleProfiles(); doReturn(ImmutableList.of(mA2dpProfile, mHeadsetProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, BluetoothAdapter.STATE_CONNECTED, BluetoothProfile.A2DP); @@ -405,7 +405,7 @@ public class AudioSharingDevicePreferenceControllerTest { .thenReturn(BluetoothAdapter.STATE_DISCONNECTED); doReturn(ImmutableList.of(mA2dpProfile, mHeadsetProfile)) .when(mCachedDevice) - .getConnectableProfiles(); + .getUiAccessibleProfiles(); doReturn(ImmutableList.of(mA2dpProfile, mHeadsetProfile)).when(mCachedDevice).getProfiles(); mController.onProfileConnectionStateChanged( mCachedDevice, BluetoothAdapter.STATE_CONNECTED, BluetoothProfile.A2DP);