commit 0f42037eb7b5118015c2caca635538324ccf0ccf
author fredc <fredc@broadcom.com> Thu Apr 12 00:02:00 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 21:20:54 2012 -0700
tree 46a7ba36216a2cb617541ec68f18b413419e148f
parent 919a4c6264b733585152ce1dc6f868c1093d368b

Non persistent adapter service

Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5

Conflicts:

	core/java/android/bluetooth/BluetoothInputDevice.java

Conflicts:

	core/java/com/android/internal/app/ShutdownThread.java
	services/java/com/android/server/SystemServer.java

Conflicts:

	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pm/ShutdownThread.java

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 2393957..f4a5f5b 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -128,6 +128,7 @@
         IPackageManager pm = null;
         Context context = null;
         WindowManagerService wm = null;
+        BluetoothManagerService bluetooth = null;
         DockObserver dock = null;
         UsbService usb = null;
         SerialService serial = null;
@@ -241,17 +242,9 @@
             } else if (factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL) {
                 Slog.i(TAG, "No Bluetooth Service (factory test)");
             } else {
-                int airplaneModeOn = Settings.System.getInt(mContentResolver,
-                        Settings.System.AIRPLANE_MODE_ON, 0);
-                int bluetoothOn = Settings.Secure.getInt(mContentResolver,
-                    Settings.Secure.BLUETOOTH_ON, 0);
-                BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-                // TODO(BT): This will not work as the Bluetooth process is not
-                // up. Depending on the process architecture, BluetoothAdapter
-                // will have to bind to the service.
-                if (adapter != null && airplaneModeOn == 0 &&  bluetoothOn != 0) {
-                    adapter.enable();
-                }
+                Slog.i(TAG, "Bluetooth Manager Service");
+                bluetooth = new BluetoothManagerService(context);
+                ServiceManager.addService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE, bluetooth);
             }
 
         } catch (RuntimeException e) {