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

Commit bddf1139 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when entering PIP from different orientation"

parents 4853cd5b b9c1bc33

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ public class PipTransition extends PipTransitionController { 
            @NonNull TransitionRequestInfo request) {

        if (request.getType() == TRANSIT_PIP) {

            WindowContainerTransaction wct = new WindowContainerTransaction();

            mPipTransitionState.setTransitionState(PipTransitionState.ENTRY_SCHEDULED);

            if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {

                wct.setActivityWindowingMode(request.getTriggerTask().token,

                        WINDOWING_MODE_UNDEFINED);

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

+3 −0
Original line number Diff line number Diff line
@@ -1598,6 +1598,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
     */

    @Rotation

    int rotationForActivityInDifferentOrientation(@NonNull ActivityRecord r) {

        if (mTransitionController.isShellTransitionsEnabled()) {

            return ROTATION_UNDEFINED;

        }

        if (!WindowManagerService.ENABLE_FIXED_ROTATION_TRANSFORM) {

            return ROTATION_UNDEFINED;

        }