Move BT settings appliance check after foreground check.

Move the BT settings appliance check after the foreground activity check.
This allows us to pair bt devices if we have a UI hooked up instead of never
allowing it.

TESTED = runs on Nexus Q.

Change-Id: I3c1ea4abb8d05236d91d2525934bec757cc5ca88
This commit is contained in:
Justin Koh
2012-07-31 18:32:39 -07:00
parent 519dda9c57
commit 7b065464c9

View File

@@ -64,17 +64,17 @@ final class LocalBluetoothPreferences {
return false; return false;
} }
// If Bluetooth Settings is visible
if (manager.isForegroundActivity()) {
return true;
}
// If in appliance mode, do not show dialog in foreground. // If in appliance mode, do not show dialog in foreground.
if ((context.getResources().getConfiguration().uiMode & if ((context.getResources().getConfiguration().uiMode &
Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) { Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
return false; return false;
} }
// If Bluetooth Settings is visible
if (manager.isForegroundActivity()) {
return true;
}
long currentTimeMillis = System.currentTimeMillis(); long currentTimeMillis = System.currentTimeMillis();
SharedPreferences sharedPreferences = getSharedPreferences(context); SharedPreferences sharedPreferences = getSharedPreferences(context);