Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge issue with ActivityInfo#getMinAspectRatio am: defbe2ff4a am: 1cd6219abb

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

Change-Id: I93964847ea4dbb63ea18d8bff99c811e1d66f306
This commit is contained in:
tomnatan
2021-10-25 12:12:14 +00:00
committed by Automerger Merge Worker
parent 15a5f96114 1cd6219abb
commit d6c2dbdb6e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -8945,7 +8945,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