Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453
Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
index cbd4390..2d5a0e9 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
@@ -46,8 +46,10 @@
import androidx.slice.widget.SliceLiveData;
import com.android.settings.R;
+import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.SliceTester;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import org.junit.After;
@@ -67,7 +69,7 @@
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowBluetoothAdapter.class)
+@Config(shadows = {ShadowBluetoothAdapter.class, ShadowCachedBluetoothDeviceManager.class})
public class BluetoothDevicesSliceTest {
private static final String BLUETOOTH_MOCK_ADDRESS = "00:11:00:11:00:11";
@@ -111,6 +113,9 @@
mShadowBluetoothAdapter.setEnabled(true);
mShadowBluetoothAdapter.setState(BluetoothAdapter.STATE_ON);
}
+ final ShadowCachedBluetoothDeviceManager shadowCachedBluetoothDeviceManager =
+ Shadow.extract(Utils.getLocalBtManager(mContext).getCachedDeviceManager());
+ shadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mBluetoothDeviceList);
}
@After