Rename CachedBluetoothDevice.getConnectableProfiles()
The original method name implied that the returned profiles were guaranteed to be connectable. However, it actually filters profiles based on user can access the profile in the UI and initiate the connection. Change the method name to getUiAccessibleProfiles() aligns the name with the actual behavior. Flag: EXEMPT simple renaming Bug: 356530795 Test: m Change-Id: Ib7d29a4bf9c213ddcecc567864583165ab97a099
This commit is contained in:
@@ -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;
|
||||
|
@@ -315,7 +315,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
|
||||
return result;
|
||||
}
|
||||
for (CachedBluetoothDevice cachedItem : mAllOfCachedDevices) {
|
||||
List<LocalBluetoothProfile> tmpResult = cachedItem.getConnectableProfiles();
|
||||
List<LocalBluetoothProfile> tmpResult = cachedItem.getUiAccessibleProfiles();
|
||||
for (LocalBluetoothProfile profile : tmpResult) {
|
||||
if (mProfileDeviceMap.containsKey(profile.toString())) {
|
||||
mProfileDeviceMap.get(profile.toString()).add(cachedItem);
|
||||
|
@@ -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);
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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));
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user