Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6c2dbdb authored by tomnatan's avatar tomnatan Committed by Automerger Merge Worker
Browse files

Fix merge issue with ActivityInfo#getMinAspectRatio am: defbe2ff am: 1cd6219a 

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

Change-Id: I93964847ea4dbb63ea18d8bff99c811e1d66f306
parents 15a5f961 1cd6219a

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -8945,7 +8945,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        }

        proto.write(PIP_AUTO_ENTER_ENABLED, pictureInPictureArgs.isAutoEnterEnabled());

        proto.write(PIP_AUTO_ENTER_ENABLED, pictureInPictureArgs.isAutoEnterEnabled());

        proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode());

        proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode());

        proto.write(MIN_ASPECT_RATIO, info.getMinAspectRatio());

        proto.write(MIN_ASPECT_RATIO, getMinAspectRatio());

    }

    }





    @Override

    @Override