Merge changes I1aabef01,I8dbd0f83

* changes:
  SystemServer: Move MountService startup before NotificationManagerService
  StorageManager: Check for a null MountService

2 files changed, 15 insertions, 8 deletions

diff --git a/core/java/android/storage/StorageManager.java b/core/java/android/storage/StorageManager.java
index dd8bd63..924d169 100644
--- a/core/java/android/storage/StorageManager.java
+++ b/core/java/android/storage/StorageManager.java
@@ -254,6 +254,10 @@ public class StorageManager
      */
     public StorageManager(Looper tgtLooper) throws RemoteException {
         mMountService = IMountService.Stub.asInterface(ServiceManager.getService("mount"));
+        if (mMountService == null) {
+            Log.e(TAG, "Unable to connect to mount service! - is it running yet?");
+            return;
+        }
         mTgtLooper = tgtLooper;
         mBinderListener = new MountServiceBinderListener();
         mMountService.registerListener(mBinderListener);
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,19 +273,22 @@ class ServerThread extends Thread {
             }
 
             try {
-                Log.i(TAG, "Notification Manager");
-                notification = new NotificationManagerService(context, statusBar, lights);
-                ServiceManager.addService(Context.NOTIFICATION_SERVICE, notification);
+                /*
+                 * 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 Notification Manager", e);
+                Log.e(TAG, "Failure starting Mount Service", e);
             }
 
             try {
-                // MountService must start after NotificationManagerService
-                Log.i(TAG, "Mount Service");
-                ServiceManager.addService("mount", new MountService(context));
+                Log.i(TAG, "Notification Manager");
+                notification = new NotificationManagerService(context, statusBar, lights);
+                ServiceManager.addService(Context.NOTIFICATION_SERVICE, notification);
             } catch (Throwable e) {
-                Log.e(TAG, "Failure starting Mount Service", e);
+                Log.e(TAG, "Failure starting Notification Manager", e);
             }
 
             try {