diff options
| author | Christopher Tate <ctate@google.com> | 2010-06-07 18:46:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-07 18:46:46 -0700 |
| commit | ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a (patch) | |
| tree | 6f9ab928487b4acb961ced8f71d791ffef38fd15 /services/java/com/android/server | |
| parent | d1d9047d5c34fb05be08099fa8cd73e4301ee0ff (diff) | |
| parent | 04c0af8f5553ee9cbba8cac80067934066835c1f (diff) | |
| download | frameworks_base-ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a.zip frameworks_base-ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a.tar.gz frameworks_base-ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a.tar.bz2 | |
Merge "Don't bring up Launcher until after boot complete" into froyo
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 8857c5f..0c11940 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 { |