Check only task's override config for adjusting bounds
We're only using task override when setting bounds, so no need
to update if merged override config is non-empty but task override
is empty.
Bug: 37648662
Test: Existing tests still pass
Change-Id: I73fd91983bf562dc888081b2a3d590b629aad255
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index bc749e1..0a999e6 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -382,9 +382,7 @@
* the adjusted bounds's top.
*/
void alignToAdjustedBounds(Rect adjustedBounds, Rect tempInsetBounds, boolean alignBottom) {
- // Task override config might be empty, while display or stack override config isn't, so
- // we have to check merged override config here.
- if (!isResizeable() || Configuration.EMPTY.equals(getMergedOverrideConfiguration())) {
+ if (!isResizeable() || Configuration.EMPTY.equals(getOverrideConfiguration())) {
return;
}