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

Commit 4b6a829a authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if... 

am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."

* commit '83a39080':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
parents 94127464 83a39080

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

+2 −1
Original line number Diff line number Diff line
@@ -511,7 +511,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 


        mHomeStack.moveHomeStackTaskToTop(homeStackTaskType);

        ActivityRecord r = getHomeActivity();

        if (r != null) {

        // Only resume home activity if isn't finishing.

        if (r != null && !r.finishing) {

            mService.setFocusedActivityLocked(r, reason);

            return resumeTopActivitiesLocked(mHomeStack, prev, null);

        }