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

Author: Christopher Tate

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

@@ -5583,7 +5583,7 @@ private final boolean attachApplicationLocked(IApplicationThread thread,
 
         // 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 {