Merge "Don't bring up Launcher until after boot complete" into froyo

This commit is contained in:
Christopher Tate
2010-06-07 18:46:46 -07:00
committed by Android (Google) Code Review

View File

@@ -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 {