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

Commit 09f5638b authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "Bluetooth: leave screen off for permission request" 

am: 172b0103

Change-Id: Id768f3a4cdbb4286cd1096f94b6fb5b11bae6cc8
parents 241d9022 172b0103

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

+0 −8
Original line number Diff line number Diff line
@@ -118,13 +118,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
                            context, deviceAddress, deviceName)) {

                context.startActivity(connectionAccessIntent);

            } else {

                // Acquire wakelock so that LCD comes up since screen is off

                PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.FULL_WAKE_LOCK |

                    PowerManager.ACQUIRE_CAUSES_WAKEUP | PowerManager.ON_AFTER_RELEASE,

                        "ConnectionAccessActivity");

                wakeLock.setReferenceCounted(false);

                wakeLock.acquire();



                // Put up a notification that leads to the dialog



                // Create an intent triggered by clicking on the
@@ -181,7 +174,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 


                notificationManager.notify(getNotificationTag(mRequestType), NOTIFICATION_ID,

                        notification);

                wakeLock.release();

            }

        } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {

            // Remove the notification