Merge "Add test for topmost home stack activity being home." into klp-dev

2013-10-11 19:50:02 +00:00
parent 1001cf21ed 760b2314d9
commit 09cb9bdcc8
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);
        }