Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev am: d76c6279e1

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

Change-Id: If243c31b640a63b8fa92f1f17115994adc9eb5c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tiger Huang
2022-11-11 05:36:38 +00:00
committed by Automerger Merge Worker
parent 98801e7c4a d76c6279e1
commit 2d8d2456c1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -1883,7 +1883,7 @@ public class WindowManagerService extends IWindowManager.Stub
// Make this invalid which indicates a null attached frame. // Make this invalid which indicates a null attached frame.
outAttachedFrame.set(0, 0, -1, -1); outAttachedFrame.set(0, 0, -1, -1);
} }
outSizeCompatScale[0] = win.getSizeCompatScale(); outSizeCompatScale[0] = win.getSizeCompatScaleForClient();
} }
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);

9
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1265,8 +1265,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
mGlobalScale = mInvGlobalScale = mSizeCompatScale = 1f; mGlobalScale = mInvGlobalScale = mSizeCompatScale = 1f;
} }
float getSizeCompatScale() { float getSizeCompatScaleForClient() {
return mSizeCompatScale; // If the size compat scale is because of the size compat bounds, we only scale down its
// coordinates at the server side without letting the client know.
return mToken.hasSizeCompatBounds() ? 1f : mSizeCompatScale;
} }
/** /**
@@ -3863,7 +3865,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
outFrames.attachedFrame.scale(mInvGlobalScale); outFrames.attachedFrame.scale(mInvGlobalScale);
} }
} }
outFrames.sizeCompatScale = mSizeCompatScale;
outFrames.sizeCompatScale = getSizeCompatScaleForClient();
// Note: in the cases where the window is tied to an activity, we should not send a // Note: in the cases where the window is tied to an activity, we should not send a
// configuration update when the window has requested to be hidden. Doing so can lead to // configuration update when the window has requested to be hidden. Doing so can lead to