diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-26 10:59:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-26 10:59:29 +0000 |
| commit | fdbef4081d715de59525d58d44881b00f616616f (patch) | |
| tree | 2d8083a71d5a056092bb5f810c81aa88ad57535c /services/java | |
| parent | af5bd75b3d65fc710784f59d1c22c164312e2691 (diff) | |
| parent | ada454152e0e2a1771f2d6574057afdb5fe01fe4 (diff) | |
| download | frameworks_base-fdbef4081d715de59525d58d44881b00f616616f.zip frameworks_base-fdbef4081d715de59525d58d44881b00f616616f.tar.gz frameworks_base-fdbef4081d715de59525d58d44881b00f616616f.tar.bz2 | |
Merge "Start MountService before performBootDexOpt"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 8a64aa6..af256f0 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -546,20 +546,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"))) { @@ -575,7 +561,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"); |