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

Commit 0aa85bdd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Correct request buffer error status" into tm-dev am: 139f57ce am: 05b0583b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18380847



Change-Id: I8df42ac95216ed42502504a9a573e641a9fa154a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4086b78b 05b0583b

services/camera/libcameraservice/device3/aidl/AidlCamera3OutputUtils.cpp

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ void requestStreamBuffers(RequestBufferStates& states, 
                            __FUNCTION__, streamId, strerror(-res), res);

                    if (res == TIMED_OUT || res == NO_MEMORY) {

                        bufRet.val.set<Tag::error>(StreamBufferRequestError::NO_BUFFER_AVAILABLE);

                    } else if (res == INVALID_OPERATION) {

                        bufRet.val.set<Tag::error>(StreamBufferRequestError::MAX_BUFFER_EXCEEDED);

                    } else {

                        bufRet.val.set<Tag::error>(StreamBufferRequestError::UNKNOWN_ERROR);

                    }