| commit | 05b0583b1d87d00201bef954ac978840fd0f1f86 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon May 23 22:33:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 23 22:33:59 2022 +0000 |
| tree | 17fa6b064b83e141582344b574db9d3d5e494048 | |
| parent | a47aa73b4116c9269cd6d7e20ee4eab9b5dcd4b6 [diff] | |
| parent | 139f57ce7756e0e56e8b60c655d5f8c5684b3b37 [diff] |
Merge "Camera: Correct request buffer error status" into tm-dev am: 139f57ce77 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18380847 Change-Id: I274a8558a86ecda7ed2df3a3685222c26348265b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/libcameraservice/device3/aidl/AidlCamera3OutputUtils.cpp b/services/camera/libcameraservice/device3/aidl/AidlCamera3OutputUtils.cpp index b462d44..b2accc1 100644 --- a/services/camera/libcameraservice/device3/aidl/AidlCamera3OutputUtils.cpp +++ b/services/camera/libcameraservice/device3/aidl/AidlCamera3OutputUtils.cpp
@@ -245,6 +245,8 @@ __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); }