Merge "Fix invalidate rotation value which causes CTS failures" into tm-qpr-dev

This commit is contained in:
Jiaming Liu
2022-11-02 03:28:20 +00:00
committed by Android (Google) Code Review

View File

@@ -1578,7 +1578,9 @@ public class DisplayRotation {
false /* forceRelayout */); false /* forceRelayout */);
} else { } else {
// Revert the rotation to our saved value if we transition from HALF_FOLDED. // Revert the rotation to our saved value if we transition from HALF_FOLDED.
mRotation = mHalfFoldSavedRotation; if (mHalfFoldSavedRotation != -1) {
mRotation = mHalfFoldSavedRotation;
}
// Tell the device to update its orientation (mFoldState is still HALF_FOLDED here // Tell the device to update its orientation (mFoldState is still HALF_FOLDED here
// so we will override USER_ROTATION_LOCKED and allow a rotation). // so we will override USER_ROTATION_LOCKED and allow a rotation).
mService.updateRotation(false /* alwaysSendConfiguration */, mService.updateRotation(false /* alwaysSendConfiguration */,