From e6818d5f6c167490cb9fa77547ee017cff01c1a7 Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Mon, 16 Dec 2019 13:57:12 -0800
Subject: [PATCH] Camera: Fix typo when comparing display size height

Call "getHeight()" instead of "getWidth()" when
comparing against preview size height.

Bug: 146364316
Test: Camera CTS
Change-Id: I588fd3b331380ff20762c24762e997d4a878cc44
Merged-In: I588fd3b331380ff20762c24762e997d4a878cc44
(cherry picked from commit 8649a916868979e5b46ebc70c7ec14602aff0998)
---
 .../hardware/camera2/params/MandatoryStreamCombination.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
index 6eaf54bd0d4da..23f18a80caf8a 100644
--- a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
+++ b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
@@ -1163,7 +1163,7 @@ public final class MandatoryStreamCombination {
             if (orderedPreviewSizes != null) {
                 for (Size size : orderedPreviewSizes) {
                     if ((mDisplaySize.getWidth() >= size.getWidth()) &&
-                            (mDisplaySize.getWidth() >= size.getHeight())) {
+                            (mDisplaySize.getHeight() >= size.getHeight())) {
                         return size;
                     }
                 }