diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-02 00:13:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-02 00:13:01 +0000 |
| commit | e3acbbb259dfe38a6337221ed3a94bb0c1f46abf (patch) | |
| tree | f5aee823e291074a92ab399e2429a4587ccc9e14 | |
| parent | 6984efa040cbbd524ad5919eac81301540a489a8 (diff) | |
| parent | d52d49c10860258cbaea278131132312e7ba1f00 (diff) | |
| download | base-e3acbbb259dfe38a6337221ed3a94bb0c1f46abf.tar.gz | |
Merge "Merge cherrypicks of [1888795] into sparse-7907387-L10600000952133081." into sparse-7907387-L10600000952133081
| -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, 0 insertions, 3 deletions
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index a62ddd084aab..fa1e9d4afcdf 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -351,7 +351,6 @@ 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 c12721080740..308df2f4e9a0 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -140,7 +140,6 @@ 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; @@ -8642,7 +8641,6 @@ 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 |