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

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

Merge "Remove obsolete parameter from addDevice"

parents 67e7ee3c 20002d03

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

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
            CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);

            if (cachedDevice == null) {

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

                                                             bluetoothManager.getProfileManager(),

                                                             mDevice);

            }

            always = cachedDevice.checkAndIncreaseMessageRejectionCount();

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

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);

        if (cachedDevice == null) {

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

                bluetoothManager.getProfileManager(), mDevice);

                mDevice);

        }



        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;