Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8da710f authored by San Mehat's avatar San Mehat Committed by Android (Google) Code Review
Browse files

Merge changes I1aabef01,I8dbd0f83 

* changes:
  SystemServer: Move MountService startup before NotificationManagerService
  StorageManager: Check for a null MountService
parents ace5a3fb 1bf3f8be

core/java/android/storage/StorageManager.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

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

+11 −8
Original line number Diff line number Diff line
@@ -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 {