summaryrefslogtreecommitdiffstats
path: root/camera2/portability/src/com/android/ex
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2014-08-07 17:57:15 -0700
committerAlan Newberger <alann@google.com>2014-08-07 17:57:15 -0700
commit4ecb0ad6d1d5dc6b12f998bf694877df06a77890 (patch)
tree240175f344442e5f29f3ba00f42b846354c8c780 /camera2/portability/src/com/android/ex
parent91a9eebe63a2481ed6adbc59ecfbb22ce41fc65e (diff)
downloadandroid_frameworks_ex-4ecb0ad6d1d5dc6b12f998bf694877df06a77890.tar.gz
android_frameworks_ex-4ecb0ad6d1d5dc6b12f998bf694877df06a77890.tar.bz2
android_frameworks_ex-4ecb0ad6d1d5dc6b12f998bf694877df06a77890.zip
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
Diffstat (limited to 'camera2/portability/src/com/android/ex')
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java2
1 files changed, 2 insertions, 0 deletions
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;