Set focus to launcher activity on return.

Setting the focus to the top activity on the home stack when
changing stack. This got lost when setting the stack to the foreground
no longer set automatically set focus.

Fixes first half of bug 9580068.

Change-Id: Ic9a662579399c052e0f0992651a32094f4aa62d0

diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index 4f30558..c05c69a 100644 (file)
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -258,7 +258,9 @@ public final class ActivityStackSupervisor {
         if (prev != null) {
             prev.mLaunchHomeTaskNext = false;
         }
-        if (mHomeStack.topRunningActivityLocked(null) != null) {
+        ActivityRecord r = mHomeStack.topRunningActivityLocked(null);
+        if (r != null) {
+            mService.setFocusedActivityLocked(r);
             return resumeTopActivitiesLocked(mHomeStack, prev, null);
         }
         return mService.startHomeActivityLocked(mCurrentUser);