summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bharatt Kukreja <bkukreja@google.com> 2023-12-21 17:22:11 +0000
committer Bharatt Kukreja <bkukreja@google.com> 2023-12-21 17:22:11 +0000
commit53098a7a99eebf97cb45e98450fa333a404f1adc (patch)
treea55deaf76bddec0c2859a75d3c8207b7ec5115c5
parent7bf658388f7b069b666d406a7fb4fa2abeb7058b (diff)
Camera: Add max digital zoom to session characteristic keys
Add ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM to available session characteristic keys. Test: Build successful Bug: 314386872 Change-Id: Ie20da1062e3b7c45cc29da6c40754a6b06b464de
-rw-r--r--core/java/android/hardware/camera2/CameraCharacteristics.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 3ab889ddfa5d..665d8d280bc6 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -557,13 +557,15 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* on a particular SessionConfiguration.</p>
*
* @return List of CameraCharacteristic keys containing characterisitics specific to a session
- * configuration. For Android 15, this list only contains CONTROL_ZOOM_RATIO_RANGE.
+ * configuration. For Android 15, this list only contains CONTROL_ZOOM_RATIO_RANGE and
+ * SCALER_AVAILABLE_MAX_DIGITAL_ZOOM.
*/
@NonNull
@FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)
public List<CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys() {
if (mAvailableSessionCharacteristicsKeys == null) {
- mAvailableSessionCharacteristicsKeys = Arrays.asList(CONTROL_ZOOM_RATIO_RANGE);
+ mAvailableSessionCharacteristicsKeys =
+ Arrays.asList(CONTROL_ZOOM_RATIO_RANGE, SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
}
return mAvailableSessionCharacteristicsKeys;
}