From a3a198d47819d9878b1d2d83f76dfb366d09995f Mon Sep 17 00:00:00 2001
From: tomnatan <tomnatan@google.com>
Date: Tue, 19 Oct 2021 13:16:47 +0000
Subject: [PATCH] Add the min aspect ratio to ActivityRecordProto and populate
 it

This is needed for CompatChangeTests to verify that the min aspect ratio
is applied directly by checking the min aspect ratio.

Bug: 203541827
Test: N/A
Change-Id: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
---
 core/proto/android/server/windowmanagerservice.proto         | 1 +
 services/core/java/com/android/server/wm/ActivityRecord.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index 6f81b822554aa..061ecc8f74884 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -364,6 +364,7 @@ message ActivityRecordProto {
     optional bool translucent = 30;
     optional bool pip_auto_enter_enabled = 31;
     optional bool in_size_compat_mode = 32;
+    optional float min_aspect_ratio = 33;
 }
 
 /* represents WindowToken */
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 7365f88440409..ce7eae39931a0 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -154,6 +154,7 @@ import static com.android.server.wm.ActivityRecordProto.IS_ANIMATING;
 import static com.android.server.wm.ActivityRecordProto.IS_WAITING_FOR_TRANSITION_START;
 import static com.android.server.wm.ActivityRecordProto.LAST_ALL_DRAWN;
 import static com.android.server.wm.ActivityRecordProto.LAST_SURFACE_SHOWING;
+import static com.android.server.wm.ActivityRecordProto.MIN_ASPECT_RATIO;
 import static com.android.server.wm.ActivityRecordProto.NAME;
 import static com.android.server.wm.ActivityRecordProto.NUM_DRAWN_WINDOWS;
 import static com.android.server.wm.ActivityRecordProto.NUM_INTERESTING_WINDOWS;
@@ -8993,6 +8994,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         }
         proto.write(PIP_AUTO_ENTER_ENABLED, pictureInPictureArgs.isAutoEnterEnabled());
         proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode());
+        proto.write(MIN_ASPECT_RATIO, info.getMinAspectRatio());
     }
 
     @Override