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

Commit 305f0dd8 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "camera.provider default: Don't stop init if vendor tags are bad."

parents fb75f8fa 0f5eb837
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -234,8 +234,10 @@ bool CameraProvider::initialize() {

    // Setup vendor tags here so HAL can setup vendor keys in camera characteristics
    VendorTagDescriptor::clearGlobalVendorTagDescriptor();
    bool setupSucceed = setUpVendorTags();
    return !setupSucceed; // return flag here is mInitFailed
    if (!setUpVendorTags()) {
        ALOGE("%s: Vendor tag setup failed, will not be available.", __FUNCTION__);
    }
    return false; // mInitFailed
}

bool CameraProvider::setUpVendorTags() {
@@ -245,7 +247,7 @@ bool CameraProvider::setUpVendorTags() {
    // Check if vendor operations have been implemented
    if (!mModule->isVendorTagDefined()) {
        ALOGI("%s: No vendor tags defined for this device.", __FUNCTION__);
        return false;
        return true;
    }

    mModule->getVendorTagOps(&vOps);