Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453 Change-Id: I45a7c8fd77798a873db7ea10683b861ee83b8622 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -46,8 +46,10 @@ import androidx.slice.core.SliceQuery;
|
||||
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.ArrayList;
|
||||
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 @@ public class BluetoothDevicesSliceTest {
|
||||
mShadowBluetoothAdapter.setEnabled(true);
|
||||
mShadowBluetoothAdapter.setState(BluetoothAdapter.STATE_ON);
|
||||
}
|
||||
final ShadowCachedBluetoothDeviceManager shadowCachedBluetoothDeviceManager =
|
||||
Shadow.extract(Utils.getLocalBtManager(mContext).getCachedDeviceManager());
|
||||
shadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mBluetoothDeviceList);
|
||||
}
|
||||
|
||||
@After
|
||||
|
Reference in New Issue
Block a user