diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-28 14:38:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-28 14:38:32 +0000 |
| commit | dfe0d9a040707c72aab20c54718d0b5f1bab56ff (patch) | |
| tree | 9c5fdb4f16d1b95527ab1d2ebb45821694ee69e3 | |
| parent | 334d98f1ece949414b94924a5bc852810e0bf367 (diff) | |
| parent | b53d97c4571f8ed09e92eee64301969b96ff1e4d (diff) | |
| download | frameworks_base-dfe0d9a040707c72aab20c54718d0b5f1bab56ff.zip frameworks_base-dfe0d9a040707c72aab20c54718d0b5f1bab56ff.tar.gz frameworks_base-dfe0d9a040707c72aab20c54718d0b5f1bab56ff.tar.bz2 | |
Merge "Change order of operations so flag is not overwritten" into klp-dev
| -rw-r--r-- | services/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index b510643..7650a65 100644 --- a/services/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/java/com/android/server/am/ActivityStackSupervisor.java @@ -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; } } |