commit a47aa73b4116c9269cd6d7e20ee4eab9b5dcd4b6
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 23 22:31:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 23 22:31:53 2022 +0000
tree d4353815663c0d5373ca0cafb0b598e85fce1dbd
parent 48fa096bc87c886f80ac1a6502dff728c3c93f48
parent 54622f1817c1d846b41ea5824d0e7e0b1b965a26

Merge "Camera: Replace SDR profile constraint value" into tm-dev am: 54622f1817

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

Change-Id: I707d94487fe3170c8005777baa7b6f149dff54c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index 6c6ddbd..5e91501 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -168,9 +168,8 @@
                                 __FUNCTION__, mCameraIdStr.c_str(), entry.data.i64[i]);
                     }
                 }
-                mDynamicProfileMap.emplace(
-                        ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD,
-                        standardBitmap);
+                mDynamicProfileMap[ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD] =
+                        standardBitmap;
             } else {
                 ALOGE("%s: Device %s supports 10-bit output but doesn't include a dynamic range"
                         " profile map!", __FUNCTION__, mCameraIdStr.c_str());