am 6b2a6a11: am b1ce68f5: am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev

* commit '6b2a6a1140d4144c2771dc44fa765268446243d4': Add test for topmost home stack activity being home.
2013-10-11 12:59:58 -07:00
parent 80fd2d5e43 6b2a6a1140
commit 2ae3a71820
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -285,7 +285,7 @@ public final class ActivityStackSupervisor {
        }
        mHomeStack.moveHomeTaskToTop();
        ActivityRecord r = mHomeStack.topRunningActivityLocked(null);
-        if (r != null) {
+        if (r != null && r.isHomeActivity()) {
            mService.setFocusedActivityLocked(r);
            return resumeTopActivitiesLocked(mHomeStack, prev, null);
        }