1 files changed, 4 insertions, 3 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
index acff9c6..9892d4a 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
@@ -31,6 +31,9 @@ class AndroidCameraCapabilities extends CameraCapabilities {
 
     private static Log.Tag TAG = new Log.Tag("AndCamCapabs");
 
+    /** Conversion from ratios to percentages. */
+    public static final float ZOOM_MULTIPLIER = 100f;
+
     private FpsComparator mFpsComparator = new FpsComparator();
     private SizeComparator mSizeComparator = new SizeComparator();
 
@@ -44,9 +47,6 @@ class AndroidCameraCapabilities extends CameraCapabilities {
         mPreferredPreviewSizeForVideo = new Size(p.getPreferredPreviewSizeForVideo());
         mSupportedPreviewFormats.addAll(p.getSupportedPreviewFormats());
         mSupportedPhotoFormats.addAll(p.getSupportedPictureFormats());
-        mMaxZoomIndex = p.getMaxZoom();
-        mZoomRatioList.addAll(p.getZoomRatios());
-        mMaxZoomRatio = mZoomRatioList.get(mMaxZoomIndex);
         mHorizontalViewAngle = p.getHorizontalViewAngle();
         mVerticalViewAngle = p.getVerticalViewAngle();
         buildPreviewFpsRange(p);
@@ -59,6 +59,7 @@ class AndroidCameraCapabilities extends CameraCapabilities {
         buildWhiteBalances(p);
 
         if (p.isZoomSupported()) {
+            mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER;
             mSupportedFeatures.add(Feature.ZOOM);
         }
         if (p.isVideoSnapshotSupported()) {