| commit | 1816240d150c4518167609b37d29434f03cfd35c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 13 04:06:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 13 04:06:32 2022 +0000 |
| tree | 0263ee4078b0fcf9f4c6ed542695beeee91fe59c | |
| parent | df71b27432c2052ba4859da8057d70174e8c39bb [diff] | |
| parent | 42c5bc96186b7bbcdbb7970c137249eda085ece0 [diff] |
Merge "Fix typo in return value" am: 460553099f am: 42c5bc9618 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2063327 Change-Id: I88a089eb069b8b064db9454c80150bc04f940814 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/VendorTagDescriptor.cpp b/camera/VendorTagDescriptor.cpp index 24fa912..b37803a 100644 --- a/camera/VendorTagDescriptor.cpp +++ b/camera/VendorTagDescriptor.cpp
@@ -760,7 +760,7 @@ Mutex::Autolock al(sLock); if (sGlobalVendorTagDescriptorCache == NULL) { ALOGE("%s: Vendor tag descriptor cache not initialized.", __FUNCTION__); - return VENDOR_TAG_NAME_ERR; + return VENDOR_TAG_TYPE_ERR; } return sGlobalVendorTagDescriptorCache->getTagType(tag, id); }