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

* commit '09cb9bdcc8949605e5a26ab50ac73970d1092978': Add test for topmost home stack activity being home.
2013-10-11 12:52:24 -07:00
parent d5786ca0a6 09cb9bdcc8
commit b1ce68f5a4
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);
        }