commit 37b5a1065fbe849e79378c192de3484bdbf9e16b
author Nick Pelly Tue Mar 24 20:46:18 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Mar 24 20:46:18 2009 -0700
tree f27d3f1fd7b6864289262e40c166c777bd898d36
parent f2f758defd4632873ab23f929d76c568388673b7

Automated import from //branches/master/...@141698,141698

core/java/android/server/BluetoothEventLoop.java

diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index 6eabea4..11c297c 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -76,8 +76,7 @@
                 }
                 break;
             case EVENT_RESTART_BLUETOOTH:
-                mBluetoothService.disable();
-                mBluetoothService.enable();
+                mBluetoothService.restart();
                 break;
             }
         }
@@ -170,6 +169,7 @@
         if (mode >= 0) {
             Intent intent = new Intent(BluetoothIntent.SCAN_MODE_CHANGED_ACTION);
             intent.putExtra(BluetoothIntent.SCAN_MODE, mode);
+            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
             mContext.sendBroadcast(intent, BLUETOOTH_PERM);
         }
     }