commit | d64ef3ef33c50a03b4be3b2baaa93aab7319fca8 | [log] [tgz] |
---|---|---|
author | Filip Gruszczynski <gruszczy@google.com> | Tue Oct 27 17:58:02 2015 -0700 |
committer | Filip Gruszczynski <gruszczy@google.com> | Wed Oct 28 09:39:45 2015 -0700 |
tree | 5bacf24f7d8eaacbd3f934d1bc55f646cc308091 | |
parent | e978607ac3cec6906fcf90b31b189bf29f47d17a [diff] [blame] |
Freeform to recents app transition. Bug: 24913782 Change-Id: I54fcbe38c51e5d75fa5ad2cb38de89d371b47bed
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 1cd3758..51042cb 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -4376,7 +4376,7 @@ RunningTaskInfo ci = new RunningTaskInfo(); ci.id = task.taskId; - ci.stackId = (task.stack == null) ? INVALID_STACK_ID : task.stack.getStackId(); + ci.stackId = mStackId; ci.baseActivity = r.intent.getComponent(); ci.topActivity = top.intent.getComponent(); ci.lastActiveTime = task.lastActiveTime;