diff options
| author | 2016-04-15 20:09:52 +0000 | |
|---|---|---|
| committer | 2016-04-15 20:09:53 +0000 | |
| commit | fe31ada9996662cf743b60ebfb4be8b61045a9af (patch) | |
| tree | fae913dcc27ad40335e33d5489bb637c6cbb0f15 | |
| parent | 53afdf293538b35bfb57ee6e22953abdeade71e9 (diff) | |
| parent | 35cdd6dd8d9c1494a16a5afd514b1bead4f6f744 (diff) | |
Merge "Fixed bug with activity moved to pinned stack left in resumed state." into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index ab3a0b3c1e40..cd465d6827ef 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2270,7 +2270,7 @@ public final class ActivityStackSupervisor implements DisplayListener { final ActivityRecord r = task.getTopActivity(); final ActivityStack prevStack = task.stack; final boolean wasFocused = isFocusedStack(prevStack) && (topRunningActivityLocked() == r); - final boolean wasResumed = wasFocused && (prevStack.mResumedActivity == r); + final boolean wasResumed = prevStack.mResumedActivity == r; // In some cases the focused stack isn't the front stack. E.g. pinned stack. // Whenever we are moving the top activity from the front stack we want to make sure to move // the stack to the front. |