From 04c0af8f5553ee9cbba8cac80067934066835c1f Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 7 Jun 2010 18:35:20 -0700 Subject: [PATCH] Don't bring up Launcher until after boot complete The preboot upgrade handling was bringing up the acore process with a default application object, then the normal "start the HOME app" code was bringing up Launcher2 [hosted in acore] in anticipation of boot completion... but then it saw that the host process was alive and continued with Launcher2's init. Launcher2 depends on a custom application object, however, so it crashed immediately. This change ensures that the HOME app is not actually initted at that level until after boot has completed, at which point its proper application class can be instantiated. Fixes bug #2732250 Change-Id: I1a15384e2c0d50e14300df0c0db236bd7b1a187c --- services/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 8857c5fd1ede3..0c11940b1b83f 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -5583,7 +5583,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen // See if the top visible activity is waiting to run in this process... HistoryRecord hr = topRunningActivityLocked(null); - if (hr != null) { + if (hr != null && normalMode) { if (hr.app == null && app.info.uid == hr.info.applicationInfo.uid && processName.equals(hr.processName)) { try {