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

Commit 0e5e908e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Provider: Set up vendor tag before getDeviceVersion"

parents 3f563582 efb7bfa9

camera/provider/2.4/default/CameraProvider.cpp

+6 −5
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ bool CameraProvider::initialize() { 
    }

    ALOGI("Loaded \"%s\" camera module", mModule->getModuleName());



    // Setup vendor tags here so HAL can setup vendor keys in camera characteristics

    VendorTagDescriptor::clearGlobalVendorTagDescriptor();

    if (!setUpVendorTags()) {

        ALOGE("%s: Vendor tag setup failed, will not be available.", __FUNCTION__);

    }



    // Setup callback now because we are going to try openLegacy next

    err = mModule->setCallbacks(this);

    if (err != OK) {
@@ -225,11 +231,6 @@ bool CameraProvider::initialize() { 
        }

    }



    // Setup vendor tags here so HAL can setup vendor keys in camera characteristics

    VendorTagDescriptor::clearGlobalVendorTagDescriptor();

    if (!setUpVendorTags()) {

        ALOGE("%s: Vendor tag setup failed, will not be available.", __FUNCTION__);

    }

    return false; // mInitFailed

}