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

Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3

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

Change-Id: I9e231ac0e16c8e8217be53cc89335758b14be6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hieu Dang
2023-02-14 02:02:08 +00:00
committed by Automerger Merge Worker
parent bd2f353f8b e1e657dac3
commit 420a8474db
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,8 +109,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
mRequestType);
connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
String deviceName = mDevice != null ? mDevice.getName() : null;
String title = null;
String message = null;
PowerManager powerManager =
@@ -118,7 +116,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
if (powerManager.isScreenOn()
&& LocalBluetoothPreferences.shouldShowDialogInForeground(
context, deviceAddress, deviceName)) {
context, mDevice)) {
context.startActivity(connectionAccessIntent);
} else {
// Put up a notification that leads to the dialog