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

Commit 580b0290 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix starting window stuck because of the remove status." into udc-qpr-dev

parents 9f19dfb2 d7388a82

services/core/java/com/android/server/wm/ActivityRecord.java

+0 −2
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ import static com.android.server.wm.IdentifierProto.USER_ID; 
import static com.android.server.wm.LetterboxConfiguration.DEFAULT_LETTERBOX_ASPECT_RATIO_FOR_MULTI_WINDOW;

import static com.android.server.wm.LetterboxConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO;

import static com.android.server.wm.StartingData.AFTER_TRANSACTION_COPY_TO_CLIENT;

import static com.android.server.wm.StartingData.AFTER_TRANSACTION_IDLE;

import static com.android.server.wm.StartingData.AFTER_TRANSACTION_REMOVE_DIRECTLY;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_PREDICT_BACK;
@@ -2860,7 +2859,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else if (lastData.mRemoveAfterTransaction == AFTER_TRANSACTION_COPY_TO_CLIENT) {

            removeStartingWindow();

        }

        lastData.mRemoveAfterTransaction = AFTER_TRANSACTION_IDLE;

    }



    void removeStartingWindowAnimation(boolean prepareAnimation) {

services/core/java/com/android/server/wm/StartingData.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public abstract class StartingData { 
     * This starting window should be removed after applying the start transaction of transition,

     * which ensures the app window has shown.

     */

    @AfterTransaction int mRemoveAfterTransaction;

    @AfterTransaction int mRemoveAfterTransaction = AFTER_TRANSACTION_IDLE;



    /** Whether to prepare the removal animation. */

    boolean mPrepareRemoveAnimation;