| commit | d8fa145b04180be0ded0152858b1657f3c7c45f0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 12 18:11:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 18:11:47 2021 +0000 |
| tree | 29c30e47e6e4dec48f67e878a2d0bf16f3741095 | |
| parent | 01650d699271fa6b599a04e521f6e8e40361758a [diff] | |
| parent | 229e07f9b922522e1612b6dd930919cf58c8865f [diff] |
Merge "Camera: Fix double-free in removeCamera" into rvc-qpr-dev am: 229e07f9b9 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13732556 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icd7ee95e0e51137ec64342dfc308a0420c99ed5c
diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 27e74f1..16fb85c 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp
@@ -549,7 +549,6 @@ } } } - free_camera_metadata(metadata); } mCameraInfoMap.removeItem(cameraId);