diff options
| author | Christopher Tate <ctate@google.com> | 2010-06-07 18:49:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-07 18:49:07 -0700 |
| commit | d5f401ba51d9f200cd25ee58eec99134576d78d9 (patch) | |
| tree | 010e6f8972e60da2d487e66763df9ab9402d703c /services | |
| parent | 04cadabd953cf04bdca5f48d3363288bb0081c5e (diff) | |
| parent | ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a (diff) | |
| download | frameworks_base-d5f401ba51d9f200cd25ee58eec99134576d78d9.zip frameworks_base-d5f401ba51d9f200cd25ee58eec99134576d78d9.tar.gz frameworks_base-d5f401ba51d9f200cd25ee58eec99134576d78d9.tar.bz2 | |
am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp
* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
Diffstat (limited to 'services')
| -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 { |