PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove obsolete parameter from addDevice"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-08-06 06:40:46 +00:00
committed by Android (Google) Code Review
parent 67e7ee3c1b 20002d0309
commit 1e23931f3e
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
View File

@@ -208,7 +208,6 @@ public class BluetoothPermissionActivity extends AlertActivity implements
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice == null) { if (cachedDevice == null) {
cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(), cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
bluetoothManager.getProfileManager(),
mDevice); mDevice);
} }
always = cachedDevice.checkAndIncreaseMessageRejectionCount(); always = cachedDevice.checkAndIncreaseMessageRejectionCount();

2
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -232,7 +232,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice == null) { if (cachedDevice == null) {
cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(), cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
bluetoothManager.getProfileManager(), mDevice); mDevice);
} }
String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY; String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;