diff options
| author | Alan Newberger <alann@google.com> | 2014-08-08 01:58:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-07 15:00:45 +0000 |
| commit | 47497bee8a3550af79f9a32c9362d7ee78364a71 (patch) | |
| tree | 222c53b64b8287e4bb91cc76886cad6a82b55961 | |
| parent | 399c82779ad59de44f46c25fd031f9909e0581e9 (diff) | |
| parent | 4ecb0ad6d1d5dc6b12f998bf694877df06a77890 (diff) | |
| download | android_frameworks_ex-47497bee8a3550af79f9a32c9362d7ee78364a71.tar.gz android_frameworks_ex-47497bee8a3550af79f9a32c9362d7ee78364a71.tar.bz2 android_frameworks_ex-47497bee8a3550af79f9a32c9362d7ee78364a71.zip | |
Merge "Fix missing zoom fields in copy constructor of CameraCapabilities" into lmp-dev
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java | 2 |
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 16d70f9..6a4c72c 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java @@ -488,6 +488,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; |