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

Commit 19d52647 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcf 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146

Change-Id: Icf270075cf196c75e797f967e721cab8aa0db332
parents df16e4b7 2e6f2dcf

tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public class AccessibilityHearingAidPreferenceControllerTest { 
    private void setupBluetoothEnvironment() {

        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;

        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);

        mBluetoothManager = new BluetoothManager(mContext);

        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);

        mBluetoothAdapter = mBluetoothManager.getAdapter();

        when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);

        when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public abstract class BluetoothDetailsControllerTestBase { 
        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = spy(new Lifecycle(mLifecycleOwner));

        mBluetoothManager = new BluetoothManager(mContext);

        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);

        mBluetoothAdapter = mBluetoothManager.getAdapter();

    }

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java

+12 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothClass; 
import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.content.Intent;

import android.os.Parcel;



import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -40,12 +41,22 @@ import org.robolectric.annotation.Config; 
@Config(shadows = {ShadowBluetoothAdapter.class})

public class BluetoothPairingControllerTest {

    private final BluetoothClass mBluetoothClass =

            new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);

            createBtClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);

    @Mock

    private BluetoothDevice mBluetoothDevice;

    private Context mContext;

    private BluetoothPairingController mBluetoothPairingController;



    private BluetoothClass createBtClass(int deviceClass) {

        Parcel p = Parcel.obtain();

        p.writeInt(deviceClass);

        p.setDataPosition(0); // reset position of parcel before passing to constructor



        BluetoothClass bluetoothClass = BluetoothClass.CREATOR.createFromParcel(p);

        p.recycle();

        return bluetoothClass;

    }



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class AudioOutputSwitchPreferenceControllerTest { 
        mPackageManager = Shadow.extract(mContext.getPackageManager());

        mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);



        mBluetoothManager = new BluetoothManager(mContext);

        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);

        mBluetoothAdapter = mBluetoothManager.getAdapter();



        mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));

tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { 
        when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile);

        when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);



        mBluetoothManager = new BluetoothManager(mContext);

        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);

        mBluetoothAdapter = mBluetoothManager.getAdapter();



        mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));