Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1ce68f5 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit '09cb9bdc':
  Add test for topmost home stack activity being home.
parents d5786ca0 09cb9bdc

services/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }