Merge "Merge "Camera: Always return 'null' for unsupported formats" into qt-dev am: c7c173389a am: 54d7219b0c" into qt-r1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2019-05-17 23:07:53 +00:00
committed by Android (Google) Code Review

View File

@@ -1507,8 +1507,7 @@ public final class StreamConfigurationMap {
dataspace != HAL_DATASPACE_DYNAMIC_DEPTH &&
dataspace != HAL_DATASPACE_HEIF) &&
mAllOutputFormats.get(format) == 0)) {
// Only throw if this is really not supported at all
throw new IllegalArgumentException("format not available");
return null;
}
Size[] sizes = new Size[sizesCount];