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

Commit e69a25ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 73ab8fcb d39fbe0f

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