Fix merge issue with ActivityInfo#getMinAspectRatio
Fix: 204041050 Test: Test: N/A Change-Id: I33a2600efa379cc3a5535b4917a64a5309f01321
This commit is contained in:
@@ -9013,7 +9013,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
|
||||||
|
|||||||
Reference in New Issue
Block a user