diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:59:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 17:59:49 -0700 |
| commit | 33c42474353ea6260c426f1cb5109ad019df533e (patch) | |
| tree | c3ee51f35f014825e04f6dc097954d39bf9b1442 /services/java | |
| parent | cd44bf9c7ae89edcf906451e162d096cf3d7e561 (diff) | |
| parent | 55744530222288c79a5e1aa61b65f7f6b2262fab (diff) | |
| download | frameworks_base-33c42474353ea6260c426f1cb5109ad019df533e.zip frameworks_base-33c42474353ea6260c426f1cb5109ad019df533e.tar.gz frameworks_base-33c42474353ea6260c426f1cb5109ad019df533e.tar.bz2 | |
am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'
* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
frameworks/base: Handle null from topRunningNonDelayedActivityLocked
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; |