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

Commit 2774073c authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Do not set report-orientation-changed for window without surface" into... 

Merge "Do not set report-orientation-changed for window without surface" into tm-dev am: eda2165b am: d49c2cea

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607662



Change-Id: I05f950ff775229b2f251949d04b3f3d565b7739d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ead1c762 d49c2cea

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

+2 −1
Original line number Diff line number Diff line
@@ -1992,7 +1992,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        scheduleAnimation();



        forAllWindows(w -> {

            if (w.mHasSurface && !rotateSeamlessly) {

            if (!w.mHasSurface) return;

            if (!rotateSeamlessly) {

                ProtoLog.v(WM_DEBUG_ORIENTATION, "Set mOrientationChanging of %s", w);

                w.setOrientationChanging(true);

            }

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

+4 −0
Original line number Diff line number Diff line
@@ -3609,6 +3609,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        mAnimatingExit = false;

        ProtoLog.d(WM_DEBUG_ANIM, "Clear animatingExit: reason=destroySurface win=%s", this);



        // Clear the flag so the buffer requested for the next new surface won't be dropped by

        // mistaking the surface size needs to update.

        mReportOrientationChanged = false;



        if (useBLASTSync()) {

            immediatelyNotifyBlastSync();

        }