commit ca3953c1004685e57c26411c47b30dc0292f6878
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 21 22:22:19 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 21 22:22:19 2022 +0000
tree ade33a883f2d976584b35d34070e25817d355f04
parent ee0a1fe5bb5c03086f0ccf6238236561bcbdadc1
parent 754fcb8c33af62e618a8ab162cbec15d5fe27a9f

Merge "Avoid multiple map lookups"

camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp

diff --git a/camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp b/camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp
index c812d54..b63e3bb 100644
--- a/camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp
+++ b/camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp
@@ -292,8 +292,7 @@
     } else {
         deviceName = std::string("device@3.4/external/") + cameraId;
     }
-    if (mCameraStatusMap.find(deviceName) != mCameraStatusMap.end()) {
-        mCameraStatusMap.erase(deviceName);
+    if (mCameraStatusMap.erase(deviceName) != 0) {
         if (mCallbacks != nullptr) {
             mCallbacks->cameraDeviceStatusChange(deviceName, CameraDeviceStatus::NOT_PRESENT);
         }
@@ -391,4 +390,4 @@
 }  // namespace provider
 }  // namespace camera
 }  // namespace hardware
-}  // namespace android
\ No newline at end of file
+}  // namespace android