diff options
| author | tomnatan <tomnatan@google.com> | 2021-10-19 13:16:47 +0000 |
|---|---|---|
| committer | tomnatan <tomnatan@google.com> | 2021-11-01 13:17:56 +0000 |
| commit | 7b9c7427b0eb08baa0bf0186e0a1388e5de064c4 (patch) | |
| tree | 8dbcb1e0d81fe7663e66a8d75eea9ef56015ec8f | |
| parent | 305a417ea78ae940c22ff2bf5caff8a1671d2e44 (diff) | |
| download | base-7b9c7427b0eb08baa0bf0186e0a1388e5de064c4.tar.gz | |
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
Merged-In: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
| -rw-r--r-- | core/proto/android/server/windowmanagerservice.proto | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index fa1e9d4afcdf..a62ddd084aab 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -351,6 +351,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 308df2f4e9a0..c12721080740 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -140,6 +140,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; @@ -8641,6 +8642,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 |