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

Merge "Fix parenthetical error." into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-09-17 20:21:40 +00:00
committed by Android (Google) Code Review
parent 463850e0c6 7504d7b24a
commit 16efe96cbc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1417,8 +1417,8 @@ public final class ActivityStackSupervisor {
final ActivityStack lastStack = getLastStack();
ActivityRecord curTop = lastStack == null?
null : lastStack.topRunningNonDelayedActivityLocked(notTop);
if (curTop != null && (curTop.task != intentActivity.task) ||
curTop.task != lastStack.topTask()) {
if (curTop != null && (curTop.task != intentActivity.task ||
curTop.task != lastStack.topTask())) {
r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
if (sourceRecord == null || (sourceStack.topActivity() != null &&
sourceStack.topActivity().task == sourceRecord.task)) {