diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0632f72eb09..a8bd35cd793 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1650,4 +1650,9 @@ [CHAR LIMIT=NONE] --> + + + + diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java index d8ecd206bd3..d1e512e37b8 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java @@ -21,9 +21,14 @@ import android.app.settings.SettingsEnums; import android.hardware.fingerprint.FingerprintManager; import android.util.Log; +import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollSidecar; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + /** * Sidecar fragment to handle the state around fingerprint enrollment. */ @@ -32,11 +37,19 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { private FingerprintUpdater mFingerprintUpdater; private @FingerprintManager.EnrollReason int mEnrollReason; + private Set mHelpIgnore; @Override public void onAttach(Activity activity) { super.onAttach(activity); mFingerprintUpdater = new FingerprintUpdater(activity); + final int[] ignoreAcquiredInfo = getResources().getIntArray( + R.array.fingerprint_acquired_ignore_list); + mHelpIgnore = new HashSet<>(); + for (int acquiredInfo: ignoreAcquiredInfo) { + mHelpIgnore.add(acquiredInfo); + } + mHelpIgnore = Collections.unmodifiableSet(mHelpIgnore); } @Override @@ -49,7 +62,6 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { getString(R.string.fingerprint_intro_error_unknown)); return; } - mFingerprintUpdater.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback, mEnrollReason); } @@ -58,7 +70,7 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { mEnrollReason = enrollReason; } - private FingerprintManager.EnrollmentCallback mEnrollmentCallback + @VisibleForTesting FingerprintManager.EnrollmentCallback mEnrollmentCallback = new FingerprintManager.EnrollmentCallback() { @Override @@ -68,6 +80,9 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { @Override public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) { + if (mHelpIgnore.contains(helpMsgId)) { + return; + } FingerprintEnrollSidecar.super.onEnrollmentHelp(helpMsgId, helpString); } diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java index 09e06723b86..bf1e06e4e0c 100644 --- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java +++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java @@ -165,6 +165,13 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements return mPackageName; } + /** Check if this device supports LE Audio Broadcast feature */ + public boolean isBroadcastSupported() { + LocalBluetoothLeBroadcast broadcast = + mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile(); + return broadcast != null ? true : false; + } + public boolean isDeviceBroadcasting() { LocalBluetoothLeBroadcast broadcast = mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile(); diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java index 2466b7747a3..0ddba089b7c 100644 --- a/src/com/android/settings/notification/MediaVolumePreferenceController.java +++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java @@ -93,7 +93,7 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont @VisibleForTesting boolean isSupportEndItem() { - return isConnectedBLEDevice(); + return getWorker() != null && getWorker().isBroadcastSupported() && isConnectedBLEDevice(); } private boolean isConnectedBLEDevice() { diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index 38fecfc5bc2..6475257b29c 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -53,6 +53,7 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; @@ -227,13 +228,29 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont } final List devices = leAudioProfile.getConnectedDevices(); for (BluetoothDevice device : devices) { - if (device.isConnected()) { + if (device.isConnected() && isDeviceInCachedList(device)) { connectedDevices.add(device); } } return connectedDevices; } + /** + * Confirm if the device exists in the cached devices list. If return true, it means + * the device is main device in the LE Audio device group. Otherwise, the device is the member + * device in the group. + */ + protected boolean isDeviceInCachedList(BluetoothDevice device) { + Collection cachedDevices = + mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy(); + for (CachedBluetoothDevice cachedDevice : cachedDevices) { + if (cachedDevice.getDevice().equals(device)) { + return true; + } + } + return false; + } + /** * get hearing aid profile connected device, exclude other devices with same hiSyncId. */ diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index a9f41822346..b049b7bfb14 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -18,6 +18,7 @@ package com.android.settings.biometrics.fingerprint; import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON; import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL; +import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UNKNOWN; import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.KEY_STATE_PREVIOUS_ROTATION; import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.SFPS_STAGE_NO_ANIMATION; @@ -35,6 +36,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.mock; + import android.content.Context; import android.content.res.ColorStateList; @@ -52,6 +55,8 @@ import android.view.Display; import android.view.Surface; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.widget.RingProgressBar; @@ -59,7 +64,6 @@ import com.android.settings.widget.RingProgressBar; import com.airbnb.lottie.LottieAnimationView; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -100,16 +104,39 @@ public class FingerprintEnrollEnrollingTest { } @Test - @Ignore public void fingerprintEnrollHelp_shouldShowHelpText() { - EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback(); + initializeActivityFor(TYPE_UNKNOWN); + TestFingerprintEnrollSidecar sidecar = new TestFingerprintEnrollSidecar(); + Resources resources = mock(Resources.class); + doReturn(resources).when(mContext).getResources(); + when(resources.getIntArray(R.array.fingerprint_acquired_ignore_list)) + .thenReturn(new int[]{3}); - enrollmentCallback.onEnrollmentProgress(123); - enrollmentCallback.onEnrollmentHelp( - FingerprintManager.FINGERPRINT_ERROR_UNABLE_TO_PROCESS, "test enrollment help"); + sidecar.setListener(mActivity); + sidecar.onAttach(mActivity); + sidecar.mEnrollmentCallback.onEnrollmentHelp(5, + "Help message should be displayed."); TextView errorText = mActivity.findViewById(R.id.error_text); - assertThat(errorText.getText()).isEqualTo("test enrollment help"); + assertThat(errorText.getText()).isEqualTo("Help message should be displayed."); + } + + @Test + public void fingerprintEnrollHelp_shouldNotShowHelpText() { + initializeActivityFor(TYPE_UNKNOWN); + TestFingerprintEnrollSidecar sidecar = new TestFingerprintEnrollSidecar(); + Resources resources = mock(Resources.class); + doReturn(resources).when(mContext).getResources(); + when(resources.getIntArray(R.array.fingerprint_acquired_ignore_list)) + .thenReturn(new int[]{3}); + + sidecar.setListener(mActivity); + sidecar.onAttach(mActivity); + sidecar.mEnrollmentCallback.onEnrollmentHelp(3, + "Help message should not be displayed."); + + TextView errorText = mActivity.findViewById(R.id.error_text); + assertThat(errorText.getText()).isEqualTo(""); } @Test @@ -319,4 +346,12 @@ public class FingerprintEnrollEnrollingTest { return callbackCaptor.getValue(); } + + private class TestFingerprintEnrollSidecar extends FingerprintEnrollSidecar { + @Nullable + @Override + public Context getContext() { + return mContext; + } + } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java index 2339f4c1d71..cd06bae479d 100644 --- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java +++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java @@ -38,11 +38,14 @@ import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; import android.net.Uri; +import com.android.settings.bluetooth.Utils; import com.android.settings.slices.ShadowSliceBackgroundWorker; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.BluetoothEventManager; +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.settingslib.media.LocalMediaManager; import org.junit.Before; @@ -69,13 +72,17 @@ public class MediaOutputIndicatorWorkerTest { @Mock private BluetoothEventManager mBluetoothEventManager; @Mock - private LocalBluetoothManager mLocalBluetoothManager; + private LocalBluetoothManager mLocalBtManager; + @Mock + private LocalBluetoothProfileManager mLocalBluetoothProfileManager; @Mock private MediaSessionManager mMediaSessionManager; @Mock private MediaController mMediaController; @Mock private LocalMediaManager mLocalMediaManager; + @Mock + private LocalBluetoothLeBroadcast mLeAudioBroadcastProfile; private Context mContext; private MediaOutputIndicatorWorker mMediaOutputIndicatorWorker; @@ -84,14 +91,18 @@ public class MediaOutputIndicatorWorkerTest { private List mMediaControllers = new ArrayList<>(); private PlaybackState mPlaybackState; private MediaController.PlaybackInfo mPlaybackInfo; + private LocalBluetoothManager mLocalBluetoothManager; @Before public void setUp() { MockitoAnnotations.initMocks(this); mShadowApplication = ShadowApplication.getInstance(); mContext = spy(RuntimeEnvironment.application); - ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; + ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager; + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); + when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); + when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(null); mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI); doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class); mMediaControllers.add(mMediaController); @@ -284,4 +295,22 @@ public class MediaOutputIndicatorWorkerTest { assertThat(mMediaOutputIndicatorWorker.getActiveLocalMediaController()).isNull(); } + + @Test + public void isBroadcastSupported_leAudioBroadcastProfileIsNull_returnFalse() { + mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager; + mMediaOutputIndicatorWorker.onSlicePinned(); + + assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isFalse(); + } + + @Test + public void isBroadcastSupported_leAudioBroadcastProfileNotNull_returnTrue() { + mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager; + mMediaOutputIndicatorWorker.onSlicePinned(); + when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()) + .thenReturn(mLeAudioBroadcastProfile); + + assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java index 56e83bb90ae..2d023d7142f 100644 --- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java @@ -113,13 +113,23 @@ public class MediaVolumePreferenceControllerTest { @Test public void isSupportEndItem_withBleDevice_returnsTrue() { + doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported(); doReturn(mDevice1).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice(); assertThat(mController.isSupportEndItem()).isTrue(); } + @Test + public void isSupportEndItem_notSupportedBroadcast_returnsFalse() { + doReturn(false).when(sMediaOutputIndicatorWorker).isBroadcastSupported(); + doReturn(mDevice1).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice(); + + assertThat(mController.isSupportEndItem()).isFalse(); + } + @Test public void isSupportEndItem_withNonBleDevice_returnsFalse() { + doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported(); doReturn(mDevice2).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice(); assertThat(mController.isSupportEndItem()).isFalse(); @@ -127,6 +137,7 @@ public class MediaVolumePreferenceControllerTest { @Test public void getSliceEndItem_NotSupportEndItem_getsNullSliceAction() { + doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported(); doReturn(mDevice2).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice(); final SliceAction sliceAction = mController.getSliceEndItem(mContext); @@ -136,6 +147,7 @@ public class MediaVolumePreferenceControllerTest { @Test public void getSliceEndItem_deviceIsBroadcasting_getsBroadcastIntent() { + doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported(); doReturn(mDevice1).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice(); doReturn(true).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting(); doReturn(mMediaController).when(sMediaOutputIndicatorWorker) @@ -155,6 +167,7 @@ public class MediaVolumePreferenceControllerTest { final CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class); when(((BluetoothMediaDevice) device).getCachedDevice()).thenReturn(cachedDevice); when(device.isBLEDevice()).thenReturn(true); + doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported(); doReturn(device).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice(); doReturn(false).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting(); doReturn(mMediaController).when(sMediaOutputIndicatorWorker) diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 77ddfbd6ef9..151d1f289c1 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -51,6 +51,8 @@ import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothEventManager; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; import com.android.settingslib.bluetooth.LeAudioProfile; @@ -71,6 +73,7 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; +import java.util.Collection; import java.util.List; @RunWith(RobolectricTestRunner.class) @@ -103,6 +106,12 @@ public class AudioOutputSwitchPreferenceControllerTest { private HearingAidProfile mHearingAidProfile; @Mock private LeAudioProfile mLeAudioProfile; + @Mock + private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private CachedBluetoothDevice mCachedBluetoothDeviceL; + @Mock + private CachedBluetoothDevice mCachedBluetoothDeviceR; private Context mContext; private PreferenceScreen mScreen; @@ -121,6 +130,7 @@ public class AudioOutputSwitchPreferenceControllerTest { private List mLeAudioActiveDevices; private List mEmptyDevices; private ShadowPackageManager mPackageManager; + private Collection mCachedDevices; @Before public void setUp() { @@ -135,6 +145,7 @@ public class AudioOutputSwitchPreferenceControllerTest { when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); when(mLocalBluetoothProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile); when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile); when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile); @@ -145,6 +156,11 @@ public class AudioOutputSwitchPreferenceControllerTest { mBluetoothManager = mContext.getSystemService(BluetoothManager.class); mBluetoothAdapter = mBluetoothManager.getAdapter(); + mCachedDevices = new ArrayList<>(); + mCachedDevices.add(mCachedBluetoothDeviceL); + mCachedDevices.add(mCachedBluetoothDeviceR); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices); + mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1)); when(mBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_1); when(mBluetoothDevice.isConnected()).thenReturn(true); @@ -397,6 +413,7 @@ public class AudioOutputSwitchPreferenceControllerTest { @Test public void getConnectedLeAudioDevices_connectedLeAudioDevice_shouldAddDeviceToList() { + when(mCachedBluetoothDeviceL.getDevice()).thenReturn(mBluetoothDevice); mEmptyDevices.clear(); mProfileConnectedDevices.clear(); mProfileConnectedDevices.add(mBluetoothDevice); @@ -409,22 +426,45 @@ public class AudioOutputSwitchPreferenceControllerTest { @Test public void getConnectedLeAudioDevices_disconnectedLeAudioDevice_shouldNotAddDeviceToList() { - BluetoothDevice connectdBtLeAduioDevice = + BluetoothDevice connectedBtLeAduioDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2)); - when(connectdBtLeAduioDevice.isConnected()).thenReturn(true); - BluetoothDevice disonnectdBtLeAduioDevice = + when(connectedBtLeAduioDevice.isConnected()).thenReturn(true); + BluetoothDevice disconnectedBtLeAduioDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_3)); - when(disonnectdBtLeAduioDevice.isConnected()).thenReturn(false); + when(disconnectedBtLeAduioDevice.isConnected()).thenReturn(false); + when(mCachedBluetoothDeviceL.getDevice()).thenReturn(mBluetoothDevice); + when(mCachedBluetoothDeviceR.getDevice()).thenReturn(connectedBtLeAduioDevice); mEmptyDevices.clear(); mProfileConnectedDevices.clear(); mProfileConnectedDevices.add(mBluetoothDevice); - mProfileConnectedDevices.add(connectdBtLeAduioDevice); - mProfileConnectedDevices.add(disonnectdBtLeAduioDevice); + mProfileConnectedDevices.add(connectedBtLeAduioDevice); + mProfileConnectedDevices.add(disconnectedBtLeAduioDevice); when(mLeAudioProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices); mEmptyDevices.addAll(mController.getConnectedLeAudioDevices()); - assertThat(mEmptyDevices).containsExactly(mBluetoothDevice, connectdBtLeAduioDevice); + assertThat(mEmptyDevices).containsExactly(mBluetoothDevice, connectedBtLeAduioDevice); + } + + @Test + public void getConnectedLeAudioDevices_notInCachedDeviceList_shouldNotAddDeviceToList() { + BluetoothDevice connectedBtLeAduioDevice1 = + spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2)); + when(connectedBtLeAduioDevice1.isConnected()).thenReturn(true); + BluetoothDevice connectedBtLeAduioDevice2 = + spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_3)); + when(connectedBtLeAduioDevice2.isConnected()).thenReturn(true); + when(mCachedBluetoothDeviceL.getDevice()).thenReturn(mBluetoothDevice); + when(mCachedBluetoothDeviceR.getDevice()).thenReturn(connectedBtLeAduioDevice1); + mEmptyDevices.clear(); + mProfileConnectedDevices.clear(); + mProfileConnectedDevices.add(connectedBtLeAduioDevice1); + mProfileConnectedDevices.add(connectedBtLeAduioDevice2); + when(mLeAudioProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices); + + mEmptyDevices.addAll(mController.getConnectedLeAudioDevices()); + + assertThat(mEmptyDevices).containsExactly(connectedBtLeAduioDevice1); } @Test diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 7543b5f83a5..cc2606b06a2 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -45,6 +45,8 @@ import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.BluetoothEventManager; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; import com.android.settingslib.bluetooth.LeAudioProfile; @@ -63,6 +65,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; +import java.util.Collection; import java.util.List; @RunWith(RobolectricTestRunner.class) @@ -100,6 +103,12 @@ public class HandsFreeProfileOutputPreferenceControllerTest { private LeAudioProfile mLeAudioProfile; @Mock private AudioSwitchPreferenceController.AudioSwitchCallback mAudioSwitchPreferenceCallback; + @Mock + private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private CachedBluetoothDevice mCachedBluetoothDeviceL; + @Mock + private CachedBluetoothDevice mCachedBluetoothDeviceR; private Context mContext; private PreferenceScreen mScreen; @@ -117,6 +126,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { private List mProfileConnectedDevices; private List mHearingAidActiveDevices; private List mLeAudioActiveDevices; + private Collection mCachedDevices; @Before public void setUp() { @@ -131,6 +141,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile); when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile); when(mLocalBluetoothProfileManager.getLeAudioProfile()).thenReturn(mLeAudioProfile); @@ -138,6 +149,11 @@ public class HandsFreeProfileOutputPreferenceControllerTest { mBluetoothManager = mContext.getSystemService(BluetoothManager.class); mBluetoothAdapter = mBluetoothManager.getAdapter(); + mCachedDevices = new ArrayList<>(); + mCachedDevices.add(mCachedBluetoothDeviceL); + mCachedDevices.add(mCachedBluetoothDeviceR); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices); + mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1)); when(mBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_1); when(mBluetoothDevice.getAlias()).thenReturn(TEST_DEVICE_NAME_1); @@ -480,6 +496,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { public void updateState_leAudioDeviceActive_shouldSetActivatedDeviceName() { mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLE_HEADSET); + when(mCachedBluetoothDeviceL.getDevice()).thenReturn(mBluetoothDevice); when(mBluetoothDevice.getName()).thenReturn(TEST_LE_AUDIO_DEVICE_NAME_1); when(mBluetoothDevice.getAlias()).thenReturn(TEST_LE_AUDIO_DEVICE_NAME_1); mProfileConnectedDevices.clear(); diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index 036d58c2cd5..5a92a0838a1 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -56,6 +56,8 @@ import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.BluetoothEventManager; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HearingAidProfile; import com.android.settingslib.bluetooth.LeAudioProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -77,6 +79,7 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; +import java.util.Collection; import java.util.List; @RunWith(RobolectricTestRunner.class) @@ -118,6 +121,12 @@ public class MediaOutputPreferenceControllerTest { private MediaSessionManager mMediaSessionManager; @Mock private MediaController mMediaController; + @Mock + private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private CachedBluetoothDevice mCachedBluetoothDeviceL; + @Mock + private CachedBluetoothDevice mCachedBluetoothDeviceR; private Context mContext; private PreferenceScreen mScreen; @@ -142,6 +151,7 @@ public class MediaOutputPreferenceControllerTest { private ApplicationInfo mAppInfo; private PackageInfo mPackageInfo; private PackageStats mPackageStats; + private Collection mCachedDevices; @Before public void setUp() { @@ -173,6 +183,7 @@ public class MediaOutputPreferenceControllerTest { when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); when(mLocalBluetoothProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile); when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile); when(mLocalBluetoothProfileManager.getLeAudioProfile()).thenReturn(mLeAudioProfile); @@ -180,6 +191,11 @@ public class MediaOutputPreferenceControllerTest { mBluetoothManager = mContext.getSystemService(BluetoothManager.class); mBluetoothAdapter = mBluetoothManager.getAdapter(); + mCachedDevices = new ArrayList<>(); + mCachedDevices.add(mCachedBluetoothDeviceL); + mCachedDevices.add(mCachedBluetoothDeviceR); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices); + mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1)); when(mBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_1); when(mBluetoothDevice.getAlias()).thenReturn(TEST_DEVICE_NAME_1); @@ -280,6 +296,8 @@ public class MediaOutputPreferenceControllerTest { public void updateState_withActiveLeAudioDevice_setActivatedDeviceName() { mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLE_HEADSET); mAudioManager.setMode(AudioManager.MODE_NORMAL); + when(mCachedBluetoothDeviceL.getDevice()).thenReturn(mBluetoothDevice); + when(mCachedBluetoothDeviceR.getDevice()).thenReturn(mSecondBluetoothDevice); when(mBluetoothDevice.getAlias()).thenReturn(TEST_LE_AUDIO_DEVICE_NAME_1); mProfileConnectedDevices.clear(); mProfileConnectedDevices.add(mBluetoothDevice);