summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2020-08-12 23:13:23 +0800
committer Riddle Hsu <riddlehsu@google.com> 2020-08-12 15:14:13 +0000
commitc865ae4320a0ba417ed446988f34ec723911273a (patch)
treeec4b2a9f3353d3408f60fb9ef2c05a3d19b46e94
parent393fe8b1c2f58f16661d15c17e051e97306ca49a (diff)
Fix inconsistent info in display frames
DisplayRotation#mRotation may be set to target rotation earlier than update display info (especially wait for remote rotation). So it is more stable to keep the basic information of display frames are set from the same source. Otherwise DisplayPolicy#getRotatedWindowBounds may misjudge that the window bounds need to rotate. Bug: 163795211 Test: atest DisplayContentTests ScreenDecorWindowTests Change-Id: Iccac43c313161502c1ce41899d39ab774a23adbc
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index affbafa095cc..49b4af019709 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -4009,9 +4009,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
mDisplayFrames.onDisplayInfoUpdated(mDisplayInfo,
calculateDisplayCutoutForRotation(mDisplayInfo.rotation));
- // TODO: Not sure if we really need to set the rotation here since we are updating from
- // the display info above...
- mDisplayFrames.mRotation = getRotation();
mDisplayPolicy.beginLayoutLw(mDisplayFrames, getConfiguration().uiMode);
int seq = mLayoutSeq + 1;