From 3931c0448a5692d0f0152a66dfa3c56c8f3d575d Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Thu, 7 Aug 2014 17:57:15 -0700
Subject: Fix missing zoom fields in copy constructor of CameraCapabilities

These fields are deprecated but while we have them, should copy them in the
constructor. This contributes to a zoom bug in the app, since ratios and indices
are dropped upon copy.

Bug: 16527845
Change-Id: I008384faa77e0c13a2790e095fa311909c1e9b44
---
 .../src/com/android/ex/camera2/portability/CameraCapabilities.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
index 9b7ca6e..1f2781b 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
@@ -485,6 +485,8 @@ public class CameraCapabilities {
         mMaxNumOfFacesSupported = src.mMaxNumOfFacesSupported;
         mMaxNumOfFocusAreas = src.mMaxNumOfFocusAreas;
         mMaxNumOfMeteringArea = src.mMaxNumOfMeteringArea;
+        mMaxZoomIndex = src.mMaxZoomIndex;
+        mZoomRatioList.addAll(src.mZoomRatioList);
         mMaxZoomRatio = src.mMaxZoomRatio;
         mHorizontalViewAngle = src.mHorizontalViewAngle;
         mVerticalViewAngle = src.mVerticalViewAngle;
-- 
cgit v1.2.3