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

Commit 00a74cd4 authored by padarshr's avatar padarshr
Browse files

Start MountService before performBootDexOpt 

This change is to start Mountservice before starting
performBootDexOpt, as in one case, in performBootDexOpt
when system upgrade happens, StorageManager will be started to
get the low threshold of DataDir. But, at this point, as
Mountservice is still not up, StorageManager will end up
having a null object of Mountservice.

Change-Id: I6dec474266faa5de67449c1bbe6ef30791e5ecaa
parent 628bc01b

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

+16 −14
Original line number Diff line number Diff line
@@ -557,20 +557,6 @@ public final class SystemServer { 
            reportWtf("making display ready", e);

        }



        try {

            mPackageManagerService.performBootDexOpt();

        } catch (Throwable e) {

            reportWtf("performing boot dexopt", e);

        }



        try {

            ActivityManagerNative.getDefault().showBootMessage(

                    context.getResources().getText(

                            com.android.internal.R.string.android_upgrading_starting_apps),

                    false);

        } catch (RemoteException e) {

        }



        if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {

            if (!disableStorage &&

                !"0".equals(SystemProperties.get("system_init.startmountservice"))) {
@@ -586,7 +572,23 @@ public final class SystemServer { 
                    reportWtf("starting Mount Service", e);

                }

            }

        }



        try {

            mPackageManagerService.performBootDexOpt();

        } catch (Throwable e) {

            reportWtf("performing boot dexopt", e);

        }



        try {

            ActivityManagerNative.getDefault().showBootMessage(

                    context.getResources().getText(

                            com.android.internal.R.string.android_upgrading_starting_apps),

                    false);

        } catch (RemoteException e) {

        }



        if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {

            if (!disableNonCoreServices) {

                try {

                    Slog.i(TAG,  "LockSettingsService");