Merge "Bluetooth: leave screen off for permission request"

This commit is contained in:
Treehugger Robot
2017-03-15 22:49:56 +00:00
committed by Gerrit Code Review

View File

@@ -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