Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b9a840e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix typo in return value" am: 46055309 am: 42c5bc96 am: 1816240d... 

Merge "Fix typo in return value" am: 46055309 am: 42c5bc96 am: 1816240d am: 87b781f8 am: e3d540ea

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2063327



Change-Id: Ic99e9b2baaadd5c8c1614ce26ebec2c9f96647d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3309d948 e3d540ea

camera/VendorTagDescriptor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ int vendor_tag_descriptor_cache_get_tag_type(uint32_t tag, 
    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);

}