| commit | 87b781f84157773d754744658621d92e19f6b022 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 13 04:27:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 13 04:27:36 2022 +0000 |
| tree | 5494f10d419265da9d44b22b3c671608b4247c99 | |
| parent | 088d7d80aa1734493e6da8163b734728dac16300 [diff] | |
| parent | 1816240d150c4518167609b37d29434f03cfd35c [diff] |
Merge "Fix typo in return value" am: 460553099f am: 42c5bc9618 am: 1816240d15 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2063327 Change-Id: Ifa59bb8bce5a59965782f177d3385802d55df06d 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); }