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

Commit d7d5ad51 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

Merge "camera2 ndk: Fix error code passed on ACameraDevice_ErrorStateCallback." 

am: 31215a03

Change-Id: Ie3b619dfd1d1a1a15adf918a79add60bd439bd8c
parents 20051364 31215a03

camera/ndk/impl/ACameraDevice.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1294,12 +1294,17 @@ CameraDevice::ServiceCallback::onDeviceError( 
        case ERROR_CAMERA_DEVICE:

        case ERROR_CAMERA_SERVICE:

        {

            int32_t errorVal = ::ERROR_CAMERA_DEVICE;

            // We keep this switch since this block might be encountered with

            // more than just 2 states. The default fallthrough could have us

            // handling more unmatched error cases.

            switch (errorCode) {

                case ERROR_CAMERA_DEVICE:

                    dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_DEVICE);

                    break;

                case ERROR_CAMERA_SERVICE:

                    dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_SERVICE);

                    errorVal = ::ERROR_CAMERA_SERVICE;

                    break;

                default:

                    dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_UNKNOWN);
@@ -1309,7 +1314,7 @@ CameraDevice::ServiceCallback::onDeviceError( 
            msg->setPointer(kContextKey, dev->mAppCallbacks.context);

            msg->setPointer(kDeviceKey, (void*) dev->getWrapper());

            msg->setPointer(kCallbackFpKey, (void*) dev->mAppCallbacks.onError);

            msg->setInt32(kErrorCodeKey, errorCode);

            msg->setInt32(kErrorCodeKey, errorVal);

            msg->post();

            break;

        }