Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0973dfa authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790 am: 2225b705

parents 7c173b36 2225b705
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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