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

Commit 72e5583d authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev

parents af85b740 b17031be

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

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
            removeAllDevices();

        }



        mLocalManager.getCachedDeviceManager().clearCachedDevices();

        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();

        mAvailableDevicesCategory.removeAll();

        mInitialScanStarted = true;

        mLocalAdapter.startScanning(true);

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

+9 −4
Original line number Diff line number Diff line
@@ -112,8 +112,13 @@ final class CachedBluetoothDeviceManager { 
        return device.getAddress();

    }



    public synchronized void clearCachedDevices() {

        mCachedDevices.clear();

    public synchronized void clearNonBondedDevices() {

        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {

            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);

            if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {

                mCachedDevices.remove(i);

            }

        }

    }



    public synchronized void onScanningStateChanged(boolean started) {