From aa561be4595ea97e5fe0535410a6836ea4a43fea Mon Sep 17 00:00:00 2001
From: Jorge Gil <jorgegil@google.com>
Date: Thu, 1 Jun 2023 00:11:34 +0000
Subject: [PATCH] Do handle MSG_RESIZED when the dragResizing flag changes

Fixes a regression from Ied3e0cc24e6b04e71b15cd5fa89fc2a8d5bef8d0
where the resized messaged stopped being handled when only the
dragResizing flag changed. This causes mPendingDragResizing to get
stuck at 'true' even after drag-resize has ended until a different
resized messages syncs it back to 'false'.

Bug: 270202228
Test: drag resize a freeform task, verify the message is handled
after resizing ends

Change-Id: I0232db4317f1282b2015360db03aa90910e88a7b
---
 core/java/android/view/ViewRootImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4cbb0409dafcf..5969a30d2db70 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1900,9 +1900,10 @@ public final class ViewRootImpl implements ViewParent,
                 && !Objects.equals(mTmpFrames.attachedFrame, attachedFrame);
         final boolean displayChanged = mDisplay.getDisplayId() != displayId;
         final boolean compatScaleChanged = mTmpFrames.compatScale != compatScale;
+        final boolean dragResizingChanged = mPendingDragResizing != dragResizing;
         if (msg == MSG_RESIZED && !frameChanged && !configChanged && !attachedFrameChanged
                 && !displayChanged && !forceNextWindowRelayout
-                && !compatScaleChanged) {
+                && !compatScaleChanged && !dragResizingChanged) {
             return;
         }