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

Commit 251c7563 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Android (Google) Code Review
Browse files

Merge "Fix CTS extension errors"

parents 18c7a363 b7fb257b

core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java

+13 −8
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
        }



        Surface postviewSurface = null;

        if (burstCaptureSurface != null) {

        if (burstCaptureSurface != null && config.getPostviewOutputConfiguration() != null) {

            CameraExtensionUtils.SurfaceInfo burstCaptureSurfaceInfo =

                    CameraExtensionUtils.querySurface(burstCaptureSurface);

            Size burstCaptureSurfaceSize =
@@ -193,8 +193,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            postviewSurface = CameraExtensionUtils.getPostviewSurface(

                        config.getPostviewOutputConfiguration(), supportedPostviewSizes,

                        burstCaptureSurfaceInfo.mFormat);



            if ((config.getPostviewOutputConfiguration() != null) && (postviewSurface == null)) {

            if (postviewSurface == null) {

                throw new IllegalArgumentException("Unsupported output surface for postview!");

            }

        }
@@ -456,12 +455,18 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
    }



    private void validateCaptureRequestTargets(@NonNull CaptureRequest request) {

        if ((request.getTargets().size() == 1) &&

                (!request.containsTarget(mClientRepeatingRequestSurface) ||

                !request.containsTarget(mClientCaptureSurface))) {

        if (request.getTargets().size() == 1) {

            boolean containsCaptureTarget =

                    mClientCaptureSurface != null && request.containsTarget(mClientCaptureSurface);

            boolean containsRepeatingTarget =

                    mClientRepeatingRequestSurface != null &&

                    request.containsTarget(mClientRepeatingRequestSurface);



            if (!containsCaptureTarget && !containsRepeatingTarget) {

                throw new IllegalArgumentException("Target output combination requested is " +

                        "not supported!");

            }

        }



        if ((request.getTargets().size() == 2) &&

                (!request.getTargets().containsAll(Arrays.asList(mClientCaptureSurface,

core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java

+13 −7
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
        }



        Surface postviewSurface = null;

        if (burstCaptureSurface != null) {

        if (burstCaptureSurface != null && config.getPostviewOutputConfiguration() != null) {

            CameraExtensionUtils.SurfaceInfo burstCaptureSurfaceInfo =

                    CameraExtensionUtils.querySurface(burstCaptureSurface);

            Size burstCaptureSurfaceSize =
@@ -218,7 +218,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
                        config.getPostviewOutputConfiguration(), supportedPostviewSizes,

                        burstCaptureSurfaceInfo.mFormat);



            if ((config.getPostviewOutputConfiguration() != null) && (postviewSurface == null)) {

            if (postviewSurface == null) {

                throw new IllegalArgumentException("Unsupported output surface for postview!");

            }

        }
@@ -717,12 +717,18 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
    }



    private void validateCaptureRequestTargets(@NonNull CaptureRequest request) {

        if ((request.getTargets().size() == 1) &&

                (!request.containsTarget(mClientRepeatingRequestSurface) ||

                !request.containsTarget(mClientCaptureSurface))) {

        if (request.getTargets().size() == 1) {

            boolean containsCaptureTarget =

                    mClientCaptureSurface != null && request.containsTarget(mClientCaptureSurface);

            boolean containsRepeatingTarget =

                    mClientRepeatingRequestSurface != null &&

                    request.containsTarget(mClientRepeatingRequestSurface);



            if (!containsCaptureTarget && !containsRepeatingTarget) {

                throw new IllegalArgumentException("Target output combination requested is " +

                        "not supported!");

            }

        }



        if ((request.getTargets().size() == 2) &&

                (!request.getTargets().containsAll(Arrays.asList(mClientCaptureSurface,