From 754fcb8c33af62e618a8ab162cbec15d5fe27a9f Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Fri, 21 Jan 2022 07:00:25 -0800 Subject: [PATCH] Avoid multiple map lookups We directly use erase(), and its return value, so we only need to look up 'deviceName' once. Test: TreeHugger Bug: 191248460 Change-Id: I7c229e7d1de5f76071f55f965eab447b6c868bcc --- .../provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp b/camera/provider/2.7/default/ExternalCameraProviderImpl_2_7.cpp index c812d54a09..b63e3bb88b 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 @@ void ExternalCameraProviderImpl_2_7::deviceRemoved(const char* devName) { } 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 @@ Return ExternalCameraProviderImpl_2_7::isConcurrentStreamCombinationSuppor } // namespace provider } // namespace camera } // namespace hardware -} // namespace android \ No newline at end of file +} // namespace android