commit fe31ada9996662cf743b60ebfb4be8b61045a9af
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 15 20:09:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 15 20:09:53 2016 +0000
tree fae913dcc27ad40335e33d5489bb637c6cbb0f15
parent 53afdf293538b35bfb57ee6e22953abdeade71e9
parent 35cdd6dd8d9c1494a16a5afd514b1bead4f6f744

Merge "Fixed bug with activity moved to pinned stack left in resumed state." into nyc-dev

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index ab3a0b3..cd465d6 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 @@
         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.