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

Commit 768dac07 authored by Jiaming Liu's avatar Jiaming Liu Committed by Automerger Merge Worker
Browse files

Merge "Fix invalidate rotation value which causes CTS failures" into tm-qpr-dev am: 72b75946 

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



Change-Id: Idae47c78557da211ae6361bb5459ac97c7858fc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b76dad0 72b75946

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

+3 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,9 @@ public class DisplayRotation { 
                        false /* forceRelayout */);

            } else {

                // Revert the rotation to our saved value if we transition from HALF_FOLDED.

                if (mHalfFoldSavedRotation != -1) {

                    mRotation = mHalfFoldSavedRotation;

                }

                // Tell the device to update its orientation (mFoldState is still HALF_FOLDED here

                // so we will override USER_ROTATION_LOCKED and allow a rotation).

                mService.updateRotation(false /* alwaysSendConfiguration */,