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

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

Browse Source 
am: fe31ada

* commit 'fe31ada9996662cf743b60ebfb4be8b61045a9af':
  Fixed bug with activity moved to pinned stack left in resumed state.

Change-Id: I07d8b2264186887972b92725856c819bd1e4c10e
This commit is contained in:
Wale Ogunwale
2016-04-15 20:15:07 +00:00
committed by android-build-merger
parent 0330f40745 fe31ada999
commit 0fae764593
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -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.