commit 27dcfbbd893cb5a65fa27ac6b968559e22bf59e4
author PauloftheWest <paulofthewest@google.com> Fri Sep 19 23:45:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 19 23:45:25 2014 +0000
tree 437ff394c14c54fba586158e154bf8de83ccd2f4
parent 1977342e43a921005e40d213bef3fe66b0bbefbc
parent 9bab4ea695efb6205b48d667db49f1964cf680ad

Merge "Fixed a Bluetooth discovery bug." into lmp-dev

src/com/android/settings/bluetooth/BluetoothSettings.java

diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 826a451..dd2c9df 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -98,10 +98,17 @@
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
+            final String action = intent.getAction();
+            final int state =
+                intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
+
             if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
                 updateDeviceName(context);
             }
+
+            if (state == BluetoothAdapter.STATE_ON) {
+                mInitiateDiscoverable = true;
+            }
         }
 
         private void updateDeviceName(Context context) {