diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:28:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-25 17:28:29 -0700 |
| commit | 55744530222288c79a5e1aa61b65f7f6b2262fab (patch) | |
| tree | d06ae88f8c090791da3d63002642543d1d4af289 /services/java | |
| parent | f0b3fa60dba67e904a2336980ecbb937d32b2387 (diff) | |
| parent | 66a5d695ed9268869ca50e304bfeabd2a021c6cd (diff) | |
| download | frameworks_base-55744530222288c79a5e1aa61b65f7f6b2262fab.zip frameworks_base-55744530222288c79a5e1aa61b65f7f6b2262fab.tar.gz frameworks_base-55744530222288c79a5e1aa61b65f7f6b2262fab.tar.bz2 | |
Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index f52d322..463493b 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -2139,7 +2139,7 @@ public class ActivityStack { // being started, which means not bringing it to the front // if the caller is not itself in the front. ActivityRecord curTop = topRunningNonDelayedActivityLocked(notTop); - if (curTop.task != taskTop.task) { + if (curTop != null && curTop.task != taskTop.task) { r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); boolean callerAtFront = sourceRecord == null || curTop.task == sourceRecord.task; |