From defbe2ff4a694780e9982215c95a3f644ff698b2 Mon Sep 17 00:00:00 2001
From: tomnatan <tomnatan@google.com>
Date: Mon, 25 Oct 2021 10:02:17 +0000
Subject: [PATCH] Fix merge issue with ActivityInfo#getMinAspectRatio

Fix: 204041050
Test: Test: N/A
Change-Id: I33a2600efa379cc3a5535b4917a64a5309f01321
---
 services/core/java/com/android/server/wm/ActivityRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index e5340db2f0e29..b8e350b753d2e 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -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