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

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

am 5ce1fac0: am a7bdd2f9: am 569a271f: am 1fee5522: am dad62b9f: Merge "Finish... 

am 5ce1fac0: am a7bdd2f9: am 569a271f: am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit '5ce1fac0':
  Finish already paused activity if it should be finished after pausing
parents d5efc98a 5ce1fac0

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

+1 −0
Original line number Diff line number Diff line
@@ -2963,6 +2963,7 @@ final class ActivityStack { 
        r.state = ActivityState.FINISHING;



        if (mode == FINISH_IMMEDIATELY

                || (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

            // If this activity is already stopped, we can just finish