diff options
| -rw-r--r-- | core/java/android/hardware/camera2/CameraExtensionCharacteristics.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java index a978bd8a3bdf..0a61c32a9cf5 100644 --- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java @@ -736,6 +736,9 @@ public final class CameraExtensionCharacteristics { return generateJpegSupportedSizes( extenders.second.getSupportedPostviewResolutions(sz), streamMap); + } else if (format == ImageFormat.JPEG_R) { + // Jpeg_R/UltraHDR is currently not supported in the basic extension case + return new ArrayList<>(); } else { throw new IllegalArgumentException("Unsupported format: " + format); } @@ -891,6 +894,9 @@ public final class CameraExtensionCharacteristics { } else { return generateSupportedSizes(null, format, streamMap); } + } else if (format == ImageFormat.JPEG_R) { + // Jpeg_R/UltraHDR is currently not supported in the basic extension case + return new ArrayList<>(); } else { throw new IllegalArgumentException("Unsupported format: " + format); } |