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

Commit f67de1db authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Check if toRotation != ROTATION_UNDEFINED before calling DisplayLayout.rotateTo" into main

parents 15a70e8c 7a4ab528

libs/WindowManager/Shell/src/com/android/wm/shell/appzoomout/AppZoomOutController.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.appzoomout;



import static android.app.WindowConfiguration.ROTATION_UNDEFINED;

import static android.view.Display.DEFAULT_DISPLAY;



import android.app.ActivityManager;
@@ -100,6 +101,7 @@ public class AppZoomOutController implements RemoteCallable<AppZoomOutController 


        mDisplayController.addDisplayWindowListener(mDisplaysChangedListener);

        mDisplayController.addDisplayChangingController(this);

        updateDisplayLayout(mContext.getDisplayId());



        mDisplayAreaOrganizer.registerOrganizer();

    }
@@ -135,8 +137,10 @@ public class AppZoomOutController implements RemoteCallable<AppZoomOutController 
    public void onDisplayChange(int displayId, int fromRotation, int toRotation,

            @Nullable DisplayAreaInfo newDisplayAreaInfo, WindowContainerTransaction wct) {

        // TODO: verify if there is synchronization issues.

        if (toRotation != ROTATION_UNDEFINED) {

            mDisplayAreaOrganizer.onRotateDisplay(mContext, toRotation);

        }

    }



    @Override

    public Context getContext() {