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

Commit cfc32935 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by android-build-merger
Browse files

Merge "Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration" into nyc-dev 

am: 32dc5a99

* commit '32dc5a99':
  Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration
parents 2ac700b4 32dc5a99

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+5 −1
Original line number Diff line number Diff line
@@ -342,7 +342,11 @@ binder::Status CameraDeviceClient::endConfigure(bool isConstrainedHighSpeed) { 
    }



    status_t err = mDevice->configureStreams(isConstrainedHighSpeed);

    if (err != OK) {

    if (err == BAD_VALUE) {

        res = STATUS_ERROR_FMT(CameraService::ERROR_ILLEGAL_ARGUMENT,

                "Camera %d: Unsupported set of inputs/outputs provided",

                mCameraId);

    } else if (err != OK) {

        res = STATUS_ERROR_FMT(CameraService::ERROR_INVALID_OPERATION,

                "Camera %d: Error configuring streams: %s (%d)",

                mCameraId, strerror(-err), err);