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

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

am 1b59c401: am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert... 

am 1b59c401: am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '1b59c401':
  Revert "Finish already paused activity if it should be finished after pausing"
parents d6edf918 1b59c401

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

+0 −1
Original line number Diff line number Diff line
@@ -2963,7 +2963,6 @@ 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