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

am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev

Browse Source 
* commit 'dfe0d9a040707c72aab20c54718d0b5f1bab56ff':
  Change order of operations so flag is not overwritten
This commit is contained in:
Craig Mautner
2013-10-28 07:40:47 -07:00
committed by Android Git Automerger
parent 09675799a0 dfe0d9a040
commit 2534c16b44
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/ActivityStackSupervisor.java
View File

@@ -1471,13 +1471,13 @@ public final class ActivityStackSupervisor {
// We really do want to push this one into the
// user's face, right now.
movedHome = true;
targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);
if ((launchFlags &
(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME))
== (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME)) {
// Caller wants to appear on home activity.
intentActivity.task.mOnTopOfHome = true;
}
targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);
options = null;
}
}