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

Commit 9f123d34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: remove flag delay_lazy_hal_instantiation" into main

parents 21c54213 940c3b7e

camera/camera_platform.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -77,13 +77,6 @@ flag { 
    bug: "280649914"

}



flag {

    namespace: "camera_platform"

    name: "delay_lazy_hal_instantiation"

    description: "Only trigger lazy HAL instantiation when the HAL is needed for an operation."

    bug: "319735068"

}



flag {

    namespace: "camera_platform"

    name: "return_buffers_outside_locks"

services/camera/libcameraservice/common/CameraProviderManager.cpp

+2 −8
Original line number Diff line number Diff line
@@ -2112,14 +2112,8 @@ status_t CameraProviderManager::tryToInitializeAidlProviderLocked( 
        const std::string& providerName, const sp<ProviderInfo>& providerInfo) {

    using aidl::android::hardware::camera::provider::ICameraProvider;



    std::shared_ptr<ICameraProvider> interface;

    if (flags::delay_lazy_hal_instantiation()) {

        // Only get remote instance if already running. Lazy Providers will be

        // woken up later.

        interface = mAidlServiceProxy->tryGetService(providerName);

    } else {

        interface = mAidlServiceProxy->getService(providerName);

    }

    // Only get remote instance if already running. Lazy Providers will be woken up later.

    std::shared_ptr<ICameraProvider> interface = mAidlServiceProxy->tryGetService(providerName);



    if (interface == nullptr) {

        ALOGW("%s: AIDL Camera provider HAL '%s' is not actually available", __FUNCTION__,

services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp

+0 −4
Original line number Diff line number Diff line
@@ -445,10 +445,6 @@ struct TestAidlInteractionProxy : public CameraProviderManager::AidlServiceInter 


    virtual std::shared_ptr<aidl::android::hardware::camera::provider::ICameraProvider>

            getService(const std::string& serviceName) override {

        if (!flags::delay_lazy_hal_instantiation()) {

            return mTestAidlCameraProvider;

        }



        // If no provider has been given, fail; in reality, getService would

        // block for HALs that don't start correctly, so we should never use

        // getService when we don't have a valid HAL running