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

Merge "Bluetooth: leave screen off for permission request" am: 172b01035d

Browse Source 
am: 09f5638b92

Change-Id: I5af6b6f3d6463cd33c9074d31ba0e8c16eb6c9a7
This commit is contained in:
Marie Janssen
2017-03-15 23:00:06 +00:00
committed by android-build-merger
parent 94854cc57b 09f5638b92
commit 895ac35f4d
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,13 +118,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
context, deviceAddress, deviceName)) { context, deviceAddress, deviceName)) {
context.startActivity(connectionAccessIntent); context.startActivity(connectionAccessIntent);
} else { } 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 // Put up a notification that leads to the dialog
// Create an intent triggered by clicking on the // Create an intent triggered by clicking on the
@@ -181,7 +174,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
notificationManager.notify(getNotificationTag(mRequestType), NOTIFICATION_ID, notificationManager.notify(getNotificationTag(mRequestType), NOTIFICATION_ID,
notification); notification);
wakeLock.release();
} }
} else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) { } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
// Remove the notification // Remove the notification