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

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

Merge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()"

parents 8b4b27ef f5c01459

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

+1 −2
Original line number Diff line number Diff line
@@ -207,8 +207,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
                    bluetoothManager.getCachedDeviceManager();

            CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);

            if (cachedDevice == null) {

                cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),

                                                             mDevice);

                cachedDevice = cachedDeviceManager.addDevice(mDevice);

            }

            always = cachedDevice.checkAndIncreaseMessageRejectionCount();

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
            bluetoothManager.getCachedDeviceManager();

        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);

        if (cachedDevice == null) {

            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),

                mDevice);

            cachedDevice = cachedDeviceManager.addDevice(mDevice);

        }



        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;