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

Commit 58eea91f authored by Stefan Kuhne's avatar Stefan Kuhne Committed by Android (Google) Code Review
Browse files

Merge "Fixing timeout caused by non executed animation"

parents dc73fc06 1b974dc9

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

+9 −9
Original line number Diff line number Diff line
@@ -2150,9 +2150,7 @@ final class ActivityStack extends ConfigurationContainer { 
                    mStackSupervisor.allResumedActivitiesComplete()) {

            // 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);

            executeAppTransition(options);

            if (DEBUG_STATES) Slog.d(TAG_STATES,

                    "resumeTopActivityLocked: Top activity resumed " + next);

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
@@ -2187,9 +2185,7 @@ final class ActivityStack extends ConfigurationContainer { 
                && mStackSupervisor.allPausedActivitiesComplete()) {

            // 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);

            executeAppTransition(options);

            if (DEBUG_STATES) Slog.d(TAG_STATES,

                    "resumeTopActivityLocked: Going to sleep and all paused");

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
@@ -2252,9 +2248,7 @@ final class ActivityStack extends ConfigurationContainer { 
            // 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);

            executeAppTransition(options);

            if (DEBUG_STATES) Slog.d(TAG_STATES,

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

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
@@ -5056,4 +5050,10 @@ final class ActivityStack extends ConfigurationContainer { 
            mTaskHistory.get(taskNdx).setLockTaskAuth();

        }

    }



    void executeAppTransition(ActivityOptions options) {

        mWindowManager.executeAppTransition();

        mNoAnimActivities.clear();

        ActivityOptions.abort(options);

    }

}

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

+3 −0
Original line number Diff line number Diff line
@@ -1844,6 +1844,9 @@ public class ActivityStackSupervisor extends ConfigurationContainer 
        final ActivityRecord r = mFocusedStack.topRunningActivityLocked();

        if (r == null || r.state != RESUMED) {

            mFocusedStack.resumeTopActivityUncheckedLocked(null, null);

        } else if (r.state == RESUMED) {

            // Kick off any lingering app transitions form the MoveTaskToFront operation.

            mFocusedStack.executeAppTransition(targetOptions);

        }

        return false;

    }