Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-10-25 17:28:29 -07:00
committed by Android (Google) Code Review
parent f0b3fa60db 66a5d695ed
commit 5574453022
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityStack.java
View File

@@ -2139,7 +2139,7 @@ public class ActivityStack {
// being started, which means not bringing it to the front // being started, which means not bringing it to the front
// if the caller is not itself in the front. // if the caller is not itself in the front.
ActivityRecord curTop = topRunningNonDelayedActivityLocked(notTop); 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); r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
boolean callerAtFront = sourceRecord == null boolean callerAtFront = sourceRecord == null
|| curTop.task == sourceRecord.task; || curTop.task == sourceRecord.task;