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
This commit is contained in:
TreeHugger Robot
2016-04-15 20:09:52 +00:00
committed by Android (Google) Code Review
parent 53afdf2935 35cdd6dd8d
commit fe31ada999
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 ActivityRecord r = task.getTopActivity();
final ActivityStack prevStack = task.stack; final ActivityStack prevStack = task.stack;
final boolean wasFocused = isFocusedStack(prevStack) && (topRunningActivityLocked() == r); 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. // 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 // Whenever we are moving the top activity from the front stack we want to make sure to move
// the stack to the front. // the stack to the front.