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

Commit ceb10ea7 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android (Google) Code Review
Browse files

Merge "Camera: setup vendor tags before get_camera_info" into mnc-dr-dev

parents 0926aab4 d4a653a1

services/camera/libcameraservice/CameraService.cpp

+7 −6
Original line number Diff line number Diff line
@@ -173,6 +173,13 @@ void CameraService::onFirstRef() 
    mNumberOfCameras = mModule->getNumberOfCameras();

    mNumberOfNormalCameras = mNumberOfCameras;



    // Setup vendor tags before we call get_camera_info the first time

    // because HAL might need to setup static vendor keys in get_camera_info

    VendorTagDescriptor::clearGlobalVendorTagDescriptor();

    if (mModule->getModuleApiVersion() >= CAMERA_MODULE_API_VERSION_2_2) {

        setUpVendorTags();

    }



    mFlashlight = new CameraFlashlight(*mModule, *this);

    status_t res = mFlashlight->findFlashUnits();

    if (res) {
@@ -239,12 +246,6 @@ void CameraService::onFirstRef() 
        mModule->setCallbacks(this);

    }



    VendorTagDescriptor::clearGlobalVendorTagDescriptor();



    if (mModule->getModuleApiVersion() >= CAMERA_MODULE_API_VERSION_2_2) {

        setUpVendorTags();

    }



    CameraDeviceFactory::registerService(this);



    CameraService::pingCameraServiceProxy();