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

Commit 29d5e62d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Save the HIDL instances regardless of device version" am:... 

Merge "Camera: Save the HIDL instances regardless of device version" am: 3e2ff26e am: 2fd32961 am: 0b14fba8 am: 77a496a4

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



Change-Id: I2c14cd07016224116664088e230cfcd04a4ac46a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0d800c1 77a496a4

services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp

+5 −7
Original line number Diff line number Diff line
@@ -697,6 +697,11 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 


    mTorchStrengthLevel = 0;



    if (!kEnableLazyHal) {

        // Save HAL reference indefinitely

        mSavedInterface = interface;

    }



    queryPhysicalCameraIds();



    // Get physical camera characteristics if applicable
@@ -757,13 +762,6 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
            }

        }

    }



    if (!kEnableLazyHal) {

        // Save HAL reference indefinitely

        mSavedInterface = interface;

    }





}



status_t HidlProviderInfo::HidlDeviceInfo3::setTorchMode(bool enabled) {