commit 22de95f3142fcdfbb665b30c6d28edd6f90759c3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 22 21:10:59 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 22 21:10:59 2021 +0000
tree 48beb4083c9dbd840159d994059eabef974ade2e
parent 5aea7eaf0521523aabe14c96425e75c70e380587
parent 2ebb839dac63103442170aa62aa86fa55e4832d1

Merge "Camera: Continue small JPEG size filtering if dynamicDepth tags fail" into sc-dev

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 1bbc2ba..7045128 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -2652,7 +2652,8 @@
     if (OK != res) {
         ALOGE("%s: Failed to append dynamic depth tags: %s (%d)", __FUNCTION__,
                 strerror(-res), res);
-        return res;
+        // Allow filtering of small JPEG sizes to succeed even if dynamic depth
+        // tags fail to generate.
     }
 
     return OK;