commit a284970f53b1de32b39d487574edd20eca843471
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Mar 10 10:11:33 2021 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Mar 10 10:11:33 2021 -0800
tree 6aa460c75a28e09d530870f35404409ba1db55aa
parent 9b46ad1feefcadf3994b8bf7b5fbcd840e319f6f

Camera: fix crash on 3.7 devices

Test: test app crash is fixed
Bug: 175662409
Change-Id: Id86b5496cc62c5630683a6cb0e1c90d3ce66e6b0

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 18eb57e..35a06d8 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -3690,8 +3690,8 @@
                         physicalCameraSettings[j].fmqSettingsSize = 0u;
                     }
                 } else {
-                    captureRequests_3_4[i].physicalCameraSettings[j].fmqSettingsSize = 0u;
-                    captureRequests_3_4[i].physicalCameraSettings[j].settings.resize(0);
+                    physicalCameraSettings[j].fmqSettingsSize = 0u;
+                    physicalCameraSettings[j].settings.resize(0);
                 }
                 physicalCameraSettings[j].physicalCameraId = request->physcam_id[j];
             }