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

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 8c07e01..de858e3 100644 (file)
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -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;
     }