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

Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev

Browse Source
This commit is contained in:
Andrii Kulian
2016-10-19 18:31:33 +00:00
committed by Android (Google) Code Review
parent 0346fee93c da3b648b64
commit 6e4f6ecbab
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -4463,7 +4463,9 @@ final class ActivityStack {
"moveTaskToBackAndShowHome"); "moveTaskToBackAndShowHome");
} }
adjustFocusedActivityLocked(mResumedActivity, "moveTaskToBack"); // Using currently focused activity value from service instead of mResumedActivity,
// because if this happens when device is locked the mResumedActivity will be null.
adjustFocusedActivityLocked(mService.mFocusedActivity, "moveTaskToBack");
mStackSupervisor.resumeFocusedStackTopActivityLocked(); mStackSupervisor.resumeFocusedStackTopActivityLocked();
return true; return true;
} }