Fix merge issue with ActivityInfo#getMinAspectRatio am: defbe2ff4a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16115300

Change-Id: I461822f88835a1b156b4f3236ae3e764527efb97
This commit is contained in:
tomnatan
2021-10-25 12:00:40 +00:00
committed by Automerger Merge Worker

View File

@@ -9013,7 +9013,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());
proto.write(MIN_ASPECT_RATIO, getMinAspectRatio());
}
@Override