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

Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 74446ce412

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I12ebf9bd8a635fb36207979dfc39c05aa34f2e4b
This commit is contained in:
Jeff Sharkey
2021-06-24 15:17:59 +00:00
committed by Automerger Merge Worker
parent c9faabdb33 74446ce412
commit 6a9a1b9e91
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
intent.putExtra(BluetoothDevice.EXTRA_ALWAYS_ALLOWED, always);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_CONNECT);
}
public void onClick(DialogInterface dialog, int which) {

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

@@ -293,6 +293,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
: BluetoothDevice.CONNECTION_ACCESS_NO);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_CONNECT);
}
}

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

@@ -212,6 +212,6 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
}
}
mContext.sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);
mContext.sendBroadcast(intent, Manifest.permission.BLUETOOTH_CONNECT);
}
}