commit 105925376f8d0f6b318c9938c7b83ef7fef094da
author The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
tree 3b19ee2bd8704cb9c6a0da7e42dec6759183de6d
parent ba87e3e6c985e7175152993b5efcc7dd2f0e1c93

auto import from //branches/cupcake_rel/...@140373

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 a629ec6..1f508a6 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -86,6 +86,7 @@
         int factoryTest = "".equals(factoryTestStr) ? SystemServer.FACTORY_TEST_OFF
                 : Integer.parseInt(factoryTestStr);
 
+        HardwareService hardware = null;
         PowerManagerService power = null;
         IPackageManager pm = null;
         Context context = null;
@@ -127,9 +128,13 @@
             BatteryService battery = new BatteryService(context);
             ServiceManager.addService("battery", battery);
 
+            Log.i(TAG, "Starting Hardware Service.");
+            hardware = new HardwareService(context);
+            ServiceManager.addService("hardware", hardware);
+
             // only initialize the power service after we have started the
-            // content providers and the batter service.
-            power.init(context, ActivityManagerService.getDefault(), battery);
+            // hardware service, content providers and the battery service.
+            power.init(context, hardware, ActivityManagerService.getDefault(), battery);
 
             Log.i(TAG, "Starting Alarm Manager.");
             AlarmManagerService alarm = new AlarmManagerService(context);
@@ -171,7 +176,7 @@
                 int bluetoothOn = Settings.Secure.getInt(mContentResolver,
                     Settings.Secure.BLUETOOTH_ON, 0);
                 if (bluetoothOn > 0) {
-                    bluetooth.enable(null);
+                    bluetooth.enable();
                 }
             }
 
@@ -208,13 +213,6 @@
             }
 
             try {
-                Log.i(TAG, "Starting Hardware Service.");
-                ServiceManager.addService("hardware", new HardwareService(context));
-            } catch (Throwable e) {
-                Log.e(TAG, "Failure starting Hardware Service", e);
-            }
-
-            try {
                 Log.i(TAG, "Starting NetStat Service.");
                 ServiceManager.addService("netstat", new NetStatService(context));
             } catch (Throwable e) {
@@ -232,7 +230,7 @@
             try {
                 Log.i(TAG, "Starting Notification Manager.");
                 ServiceManager.addService(Context.NOTIFICATION_SERVICE,
-                        new NotificationManagerService(context, statusBar));
+                        new NotificationManagerService(context, statusBar, hardware));
             } catch (Throwable e) {
                 Log.e(TAG, "Failure starting Notification Manager", e);
             }