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

Commit 12069ba3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am:... 

Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db875 am: 83a6256f am: ed6abdda

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451

Change-Id: I884143be08a9ac914836d896597ba6db63fdf8d9
parents 54b5003b ed6abdda

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1670,7 +1670,7 @@ bool CameraHidlTest::isSecureOnly(sp<ICameraProvider> provider, const hidl_strin 
    Return<void> ret;

    Return<void> ret;

    ::android::sp<ICameraDevice> device3_x;

    ::android::sp<ICameraDevice> device3_x;

    bool retVal = false;

    bool retVal = false;

    if (getCameraDeviceVersion(mProviderType, name) == CAMERA_DEVICE_API_VERSION_1_0) {

    if (getCameraDeviceVersion(name, mProviderType) == CAMERA_DEVICE_API_VERSION_1_0) {

        return false;

        return false;

    }

    }

    ret = provider->getCameraDeviceInterface_V3_x(name, [&](auto status, const auto& device) {

    ret = provider->getCameraDeviceInterface_V3_x(name, [&](auto status, const auto& device) {