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

Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp

Browse Source 
am: ead9448b4a

* commit 'ead9448b4a9284543e875115dde389444f2e2e3e':
  Always show pairing dialog for device-specific keyboard.
This commit is contained in:
Jeff Sharkey
2015-10-20 23:14:42 +00:00
committed by android-build-merger
parent 5368e7519d ead9448b4a
commit 2f43b146f5
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,10 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
PowerManager powerManager =
(PowerManager)context.getSystemService(Context.POWER_SERVICE);
String deviceAddress = device != null ? device.getAddress() : null;
if (powerManager.isScreenOn() &&
LocalBluetoothPreferences.shouldShowDialogInForeground(context, deviceAddress)) {
String deviceName = device != null ? device.getName() : null;
boolean shouldShowDialog= LocalBluetoothPreferences.shouldShowDialogInForeground(
context, deviceAddress, deviceName);
if (powerManager.isInteractive() && shouldShowDialog) {
// Since the screen is on and the BT-related activity is in the foreground,
// just open the dialog
context.startActivity(pairingIntent);