commit af87b707107ccab0b7a29bd784c9025606960c56
author Greg Kaiser <gkaiser@google.com> Tue Jan 29 16:06:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 29 16:06:40 2019 +0000
tree d0d0c84e9e160e0cec0b935b99e053de1467e998
parent 5136492129b3ce1e6a31a353f386cdc854377d49
parent 07095df02a11678cf4637ead28bc5c8c5d27db2a

Merge "DepthCompositeStream: Fix erase() in error case"

services/camera/libcameraservice/api2/DepthCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/DepthCompositeStream.cpp b/services/camera/libcameraservice/api2/DepthCompositeStream.cpp
index 1cf9529..f627b25 100644
--- a/services/camera/libcameraservice/api2/DepthCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/DepthCompositeStream.cpp
@@ -128,7 +128,7 @@
             ALOGE("%s: Error locking blob image buffer: %s (%d)", __FUNCTION__,
                     strerror(-res), res);
             mPendingInputFrames[*it].error = true;
-            mInputDepthBuffers.erase(it);
+            mInputJpegBuffers.erase(it);
             continue;
         }