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

Commit 6e148d33 authored by hughchen's avatar hughchen Committed by android-build-merger
Browse files

Merge "Remove all device from preference when BT is disabled" into qt-dev am: e69a25ca 

am: 8fcce3e5

Change-Id: I26ce994197c1b85e23f00f81227f359e4bd4ed29
parents 85a7d472 8fcce3e5

src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback, 
            for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {

                update(cachedBluetoothDevice);

            }

        } else {

          removeAllDevicesFromPreference();

        }

    }

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

+5 −2
Original line number Diff line number Diff line
@@ -215,11 +215,14 @@ public class BluetoothDeviceUpdaterTest { 
    }



    @Test

    public void forceUpdate_bluetoothDisabled_doNothing() {

    public void forceUpdate_bluetoothDisabled_removeAllDevicesFromPreference() {

        mShadowBluetoothAdapter.setEnabled(false);

        mBluetoothDeviceUpdater.mPreferenceMap.put(mBluetoothDevice, mPreference);



        mBluetoothDeviceUpdater.forceUpdate();



        verify(mDevicePreferenceCallback, never()).onDeviceAdded(any(Preference.class));

        verify(mDevicePreferenceCallback).onDeviceRemoved(mPreference);

        assertThat(mBluetoothDeviceUpdater.mPreferenceMap).isEmpty();

    }



    @Test