Merge changes from topic "cherrypicker-L77300030007239273:N00600030116629593" into main am: aac9f819c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3310648
Change-Id: Ic555109177e9b168117c4b4de64e926731a8bf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/window/SnapshotDrawerUtils.java b/core/java/android/window/SnapshotDrawerUtils.java
index bc66349..5dc6875 100644
--- a/core/java/android/window/SnapshotDrawerUtils.java
+++ b/core/java/android/window/SnapshotDrawerUtils.java
@@ -152,7 +152,9 @@
@VisibleForTesting
public void setFrames(Rect frame, Rect systemBarInsets) {
mFrame.set(frame);
- mSizeMismatch = (mFrame.width() != mSnapshotW || mFrame.height() != mSnapshotH);
+ final Rect letterboxInsets = mSnapshot.getLetterboxInsets();
+ mSizeMismatch = (mFrame.width() != mSnapshotW || mFrame.height() != mSnapshotH)
+ || letterboxInsets.left != 0 || letterboxInsets.top != 0;
if (!Flags.drawSnapshotAspectRatioMatch() && systemBarInsets != null) {
mSystemBarInsets.set(systemBarInsets);
mSystemBarBackgroundPainter.setInsets(systemBarInsets);