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

am 83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.

Browse Source 
Merge commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6' into gingerbread-plus-aosp

* commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6':
  BT: The Phone doesn't "wake up" when trying to pair with it.
This commit is contained in:
Erik Ljungberg
2010-09-01 22:04:59 -07:00
committed by Android Git Automerger
parent 16339b6f35 83c3b64ff7
commit 6e6d05801e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/bluetooth/BluetoothPairingRequest.java
View File

@@ -27,6 +27,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.text.TextUtils; import android.text.TextUtils;
import android.os.PowerManager;
/** /**
* BluetoothPairingRequest is a receiver for any Bluetooth pairing request. It * BluetoothPairingRequest is a receiver for any Bluetooth pairing request. It
@@ -61,9 +62,13 @@ public class BluetoothPairingRequest extends BroadcastReceiver {
pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST); pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PowerManager powerManager =
(PowerManager)context.getSystemService(Context.POWER_SERVICE);
String deviceAddress = device != null ? device.getAddress() : null; String deviceAddress = device != null ? device.getAddress() : null;
if (localManager.shouldShowDialogInForeground(deviceAddress)) { if (powerManager.isScreenOn() &&
// Since the BT-related activity is in the foreground, just open the dialog localManager.shouldShowDialogInForeground(deviceAddress)) {
// Since the screen is on and the BT-related activity is in the foreground,
// just open the dialog
context.startActivity(pairingIntent); context.startActivity(pairingIntent);
} else { } else {
@@ -88,6 +93,7 @@ public class BluetoothPairingRequest extends BroadcastReceiver {
res.getString(R.string.bluetooth_notif_message) + name, res.getString(R.string.bluetooth_notif_message) + name,
pending); pending);
notification.flags |= Notification.FLAG_AUTO_CANCEL; notification.flags |= Notification.FLAG_AUTO_CANCEL;
notification.defaults |= Notification.DEFAULT_SOUND;
NotificationManager manager = (NotificationManager) NotificationManager manager = (NotificationManager)
context.getSystemService(Context.NOTIFICATION_SERVICE); context.getSystemService(Context.NOTIFICATION_SERVICE);