Skip to content

Commit 04c0af8

Browse files
author
Christopher Tate
committed
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
1 parent df2e2ef commit 04c0af8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

services/java/com/android/server/am/ActivityManagerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5583,7 +5583,7 @@ private final boolean attachApplicationLocked(IApplicationThread thread,
55835583

55845584
// See if the top visible activity is waiting to run in this process...
55855585
HistoryRecord hr = topRunningActivityLocked(null);
5586-
if (hr != null) {
5586+
if (hr != null && normalMode) {
55875587
if (hr.app == null && app.info.uid == hr.info.applicationInfo.uid
55885588
&& processName.equals(hr.processName)) {
55895589
try {

0 commit comments

Comments
 (0)