diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-15 05:17:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-15 05:17:34 +0000 |
| commit | db1b5a3f4824a72c49af33ff78d061531ffc2ddd (patch) | |
| tree | 9b80a195529855e4f6653e9fb17fce0b95f0c6fd /camera/common/1.0/default/CameraModule.cpp | |
| parent | cca99ce47f6d275bf768361117559acacebd0798 (diff) | |
| parent | d4b8d2179f17a261b348b8a38cbc5278f8b4d45d (diff) | |
Merge "Camera: Fix a crash in removeCamera()"
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
| -rw-r--r-- | camera/common/1.0/default/CameraModule.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 392ebbc237..9c2b02ba0c 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp @@ -466,8 +466,8 @@ status_t CameraModule::filterOpenErrorCode(status_t err) { } void CameraModule::removeCamera(int cameraId) { - free_camera_metadata( - const_cast<camera_metadata_t*>(mCameraInfoMap[cameraId].static_camera_characteristics)); + free_camera_metadata(const_cast<camera_metadata_t*>( + mCameraInfoMap.valueFor(cameraId).static_camera_characteristics)); mCameraInfoMap.removeItem(cameraId); mDeviceVersionMap.removeItem(cameraId); } |