Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be4d3d7d authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Merge "Camera: Always return 'null' for unsupported formats" into... 

Merge "Merge "Camera: Always return 'null' for unsupported formats" into qt-dev am: c7c17338 am: 54d7219b" into qt-r1-dev-plus-aosp
am: 77be6638

Change-Id: I4d040080ffab3bc39a99eee64d6a26d39fd563e9
parents 30f3bc28 77be6638

core/java/android/hardware/camera2/params/StreamConfigurationMap.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -1507,8 +1507,7 @@ public final class StreamConfigurationMap { 
                            dataspace != HAL_DATASPACE_DYNAMIC_DEPTH &&

                            dataspace != HAL_DATASPACE_DYNAMIC_DEPTH &&

                            dataspace != HAL_DATASPACE_HEIF) &&

                            dataspace != HAL_DATASPACE_HEIF) &&

                 mAllOutputFormats.get(format) == 0)) {

                 mAllOutputFormats.get(format) == 0)) {

            // Only throw if this is really not supported at all

            return null;

            throw new IllegalArgumentException("format not available");

        }

        }





        Size[] sizes = new Size[sizesCount];

        Size[] sizes = new Size[sizesCount];