commit 1bf3f8be7c01aa77afc114e0728cb041e95640b1
author San Mehat <san@google.com> Wed Feb 03 14:43:09 2010 -0800
committer San Mehat <san@google.com> Mon Feb 08 19:29:58 2010 -0800
tree 7ab5a3f08ad416cab636063c89a2e30279eee9cb
parent 17da5a691c72fb3dbab37ce1ae1ed3a376e90c32

SystemServer: Move MountService startup before NotificationManagerService

Signed-off-by: San Mehat <san@google.com>

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 ee1cc8d..6e9c21b 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -273,6 +273,17 @@
             }
 
             try {
+                /*
+                 * NotificationManagerService is dependant on MountService,
+                 * (for media / usb notifications) so we must start MountService first.
+                 */
+                Log.i(TAG, "Mount Service");
+                ServiceManager.addService("mount", new MountService(context));
+            } catch (Throwable e) {
+                Log.e(TAG, "Failure starting Mount Service", e);
+            }
+
+            try {
                 Log.i(TAG, "Notification Manager");
                 notification = new NotificationManagerService(context, statusBar, lights);
                 ServiceManager.addService(Context.NOTIFICATION_SERVICE, notification);
@@ -281,14 +292,6 @@
             }
 
             try {
-                // MountService must start after NotificationManagerService
-                Log.i(TAG, "Mount Service");
-                ServiceManager.addService("mount", new MountService(context));
-            } catch (Throwable e) {
-                Log.e(TAG, "Failure starting Mount Service", e);
-            }
-
-            try {
                 Log.i(TAG, "Device Storage Monitor");
                 ServiceManager.addService(DeviceStorageMonitorService.SERVICE,
                         new DeviceStorageMonitorService(context));