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

DO NOT MERGE -- Use focused activity value when moving task back

Browse Source 
When task is moved back we need to adjust currently focused activity
and sent currently resumed record from ActivityStack. However if this
happens when device is locked, resumed activity record will be null.
Need to used currently focused record from service instead.

Bug: 32172829
Change-Id: I2de9bc4135663ab45af859f21e9e92562deb44d4
This commit is contained in:
Andrii Kulian
2016-10-18 13:54:38 -07:00
parent 8e7b934850
commit da3b648b64
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");
}
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();
return true;
}