commit 40c20b06ba7d152ef668b9bf75986d35a217e67c
author Christopher Tate <ctate@google.com> Mon Jun 07 18:50:44 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 07 18:50:44 2010 -0700
tree 3f041f405848fa389029d0e7bdf59668a33ddb87
parent fe2c0864f1b2910ad1871ce59402c82e6949e811
parent 8a7fa44fdc4163083703cf1127839bcf35decb9f

am 8a7fa44f: am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo

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

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index c61f90e..b3c5199 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -5788,7 +5788,7 @@
 
         // 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 {