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

Commit 45a2046a 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... 

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

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



Change-Id: I21fb7b6b0edbe156c5016be9cb7e7c86ba814c26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5cc1f34 768dac07

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 */,