diff options
| author | 2025-03-19 10:34:53 -0700 | |
|---|---|---|
| committer | 2025-03-19 10:34:53 -0700 | |
| commit | e50dd9733f2ad64dadde0c8557734a526b7b9963 (patch) | |
| tree | 0b333ca07cd8cab390935dd8d262bc501618d56f | |
| parent | c9bb0443253dc315a26f1f95def778af1d459edf (diff) | |
| parent | 359c769f7c24ee2c3f6758c532c69ed324fb4829 (diff) | |
Merge "Camera: Update sessionConfigurationQueryVersion doc" into main
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 210653bb41e5..63c819eb8233 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -5198,12 +5198,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * </tr> * <tr> * <td style="text-align: center;">PRIV</td> - * <td style="text-align: center;">S1080P</td> - * <td style="text-align: center;">PRIV</td> - * <td style="text-align: center;">UHD</td> - * </tr> - * <tr> - * <td style="text-align: center;">PRIV</td> * <td style="text-align: center;">S720P</td> * <td style="text-align: center;">JPEG/JPEG_R</td> * <td style="text-align: center;">MAXIMUM_16_9</td> @@ -5271,28 +5265,36 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * </thead> * <tbody> * <tr> - * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">PRIV Preview</td> * <td style="text-align: center;">S1080P</td> - * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">PRIV Video</td> * <td style="text-align: center;">S1080P</td> * <td style="text-align: center;"></td> * <td style="text-align: center;"></td> * </tr> * <tr> - * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">PRIV Preview</td> * <td style="text-align: center;">S1080P</td> - * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">PRIV Video</td> * <td style="text-align: center;">S1440P</td> * <td style="text-align: center;"></td> * <td style="text-align: center;"></td> * </tr> * <tr> - * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">PRIV Preview</td> * <td style="text-align: center;">S1080P</td> - * <td style="text-align: center;">YUV</td> + * <td style="text-align: center;">PRIV Video</td> + * <td style="text-align: center;">UHD</td> + * <td style="text-align: center;"></td> + * <td style="text-align: center;"></td> + * </tr> + * <tr> + * <td style="text-align: center;">PRIV Preview</td> * <td style="text-align: center;">S1080P</td> + * <td style="text-align: center;">YUV Analysis</td> * <td style="text-align: center;">S1080P</td> - * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">PRIV Video</td> + * <td style="text-align: center;">1080P</td> * </tr> * </tbody> * </table> |