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

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

am e2b8bd72: am 16c32207: Merge "Do not enter resumeTopActivity recursively." into klp-dev 

* commit 'e2b8bd72':
  Do not enter resumeTopActivity recursively.
parents b7b64ffc e2b8bd72

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

+4 −2
Original line number Diff line number Diff line
@@ -1110,8 +1110,10 @@ final class ActivityStack { 
                                case PAUSED:

                                    // This case created for transitioning activities from

                                    // translucent to opaque {@link Activity#convertToOpaque}.

                                    mStackSupervisor.mStoppingActivities.remove(r);

                                    stopActivityLocked(r);

                                    if (!mStackSupervisor.mStoppingActivities.contains(r)) {

                                        mStackSupervisor.mStoppingActivities.add(r);

                                    }

                                    mStackSupervisor.scheduleIdleLocked();

                                    break;



                                default: