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

Commit a4658663 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f 

am: 7399079b

* commit '7399079b':
  Only resuming starting dontWaitForPause activity once

Change-Id: I28a1b0fb32c521ae990e96375fdb819dc12c95ca
parents 62524105 7399079b

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

+14 −0
Original line number Diff line number Diff line
@@ -2258,6 +2258,20 @@ final class ActivityStack { 
            }

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();

            return true;

        } else if (mResumedActivity == next && next.state == ActivityState.RESUMED &&

                mStackSupervisor.allResumedActivitiesComplete()) {

            // It is possible for the activity to be resumed when we paused back stacks above if the

            // next activity doesn't have to wait for pause to complete.

            // So, nothing else to-do except:

            // Make sure we have executed any pending transitions, since there

            // should be nothing left to do at this point.

            mWindowManager.executeAppTransition();

            mNoAnimActivities.clear();

            ActivityOptions.abort(options);

            if (DEBUG_STATES) Slog.d(TAG_STATES,

                    "resumeTopActivityLocked: Top activity resumed (dontWaitForPause) " + next);

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();

            return true;

        }



        // If the most recent activity was noHistory but was only stopped rather