1 files changed, 10 insertions, 2 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
index 51c1422..8001a37 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
@@ -81,7 +81,7 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
         mMaxNumOfFacesSupported = p.get(STATISTICS_INFO_MAX_FACE_COUNT);
         mMaxNumOfMeteringArea = p.get(CONTROL_MAX_REGIONS_AE);
 
-        // TODO: Populate mMaxZoomRatio
+        mMaxZoomRatio = p.get(SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
         // TODO: Populate mHorizontalViewAngle
         // TODO: Populate mVerticalViewAngle
         // TODO: Populate mZoomRatioList
@@ -97,6 +97,10 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
             mSupportedFeatures.add(Feature.METERING_AREA);
         }
 
+        if (mMaxZoomRatio > CameraCapabilities.ZOOM_RATIO_UNZOOMED) {
+            mSupportedFeatures.add(Feature.ZOOM);
+        }
+
         // TODO: Detect other features
     }
 
@@ -200,7 +204,6 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
                 return SceneMode.CANDLELIGHT;
             case CONTROL_SCENE_MODE_FIREWORKS:
                 return SceneMode.FIREWORKS;
-            // TODO: We cannot support HDR
             case CONTROL_SCENE_MODE_LANDSCAPE:
                 return SceneMode.LANDSCAPE;
             case CONTROL_SCENE_MODE_NIGHT:
@@ -222,6 +225,11 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
                 return SceneMode.THEATRE;
             // TODO: We cannot expose FACE_PRIORITY, or HIGH_SPEED_VIDEO
         }
+
+        if (sm == LegacyVendorTags.CONTROL_SCENE_MODE_HDR) {
+            return SceneMode.HDR;
+        }
+
         Log.w(TAG, "Unable to convert from API 2 scene mode: " + sm);
         return null;
     }