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

Commit 8c3b3cfc authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in allowOverlappingTransitions" into main

parents 80697da8 5690a578

core/java/android/app/EnterTransitionCoordinator.java

+6 −2
Original line number Diff line number Diff line
@@ -706,8 +706,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
    }



    private boolean allowOverlappingTransitions() {

        return mIsReturning ? getWindow().getAllowReturnTransitionOverlap()

                : getWindow().getAllowEnterTransitionOverlap();

        final Window window = getWindow();

        if (window == null) {

            return false;

        }

        return mIsReturning ? window.getAllowReturnTransitionOverlap()

                : window.getAllowEnterTransitionOverlap();

    }



    private void startRejectedAnimations(final ArrayList<View> rejectedSnapshots) {