Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev (d0f6b4f6) · Commits · e / os / android_frameworks_base

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

+16 −14

Original line number	Diff line number	Diff line
		@@ -549,20 +549,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"))) {
		@@ -578,7 +564,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");