diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:27:16 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:27:16 -0700 |
| commit | 66a5d695ed9268869ca50e304bfeabd2a021c6cd (patch) | |
| tree | 1f8f0af3560c3408c4565499e8230ceda05cf758 /services | |
| parent | 41d21efd61157c9a4c49b2f7a6580ae0cbb58397 (diff) | |
| parent | b4ae2f1ba419212224d53db81c46ad242bebd17b (diff) | |
| download | frameworks_base-66a5d695ed9268869ca50e304bfeabd2a021c6cd.zip frameworks_base-66a5d695ed9268869ca50e304bfeabd2a021c6cd.tar.gz frameworks_base-66a5d695ed9268869ca50e304bfeabd2a021c6cd.tar.bz2 | |
resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
Diffstat (limited to 'services')
| -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; |