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

Commit 3518e360 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Try adding a passthrough legacy service" into oc-dr1-dev 

am: efe97310

Change-Id: Id9e41637c8afcf6d4a06fede7e023d41ee9126aa
parents 072db075 efe97310

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

+15 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ using ::android::hardware::kSynchronizedReadWrite; 
using ResultMetadataQueue = MessageQueue<uint8_t, kSynchronizedReadWrite>;

using ::android::hidl::manager::V1_0::IServiceManager;



const char kCameraPassthroughServiceName[] = "legacy/0";

const char *kProviderFQName = "android.hardware.camera.provider@2.4::ICameraProvider";

const uint32_t kMaxPreviewWidth = 1920;

const uint32_t kMaxPreviewHeight = 1080;
@@ -257,6 +258,20 @@ void CameraHidlEnvironment::SetUp() { 
        }

    });



    std::string legacyName;

    uint32_t legacyId;

    ASSERT_TRUE(parseProviderName(kCameraPassthroughServiceName,

            &legacyName /*out*/, &legacyId /*out*/));

    auto legacyIt = mProviders.find(legacyName);

    //Add any legacy passthrough implementations

    if (legacyIt == mProviders.end()) {

        sp<ICameraProvider> provider = ICameraProvider::tryGetService(

                kCameraPassthroughServiceName);

        if (nullptr != provider.get()) {

            mProviders.emplace(legacyName, provider);

        }

    }



    ASSERT_FALSE(mProviders.empty());

}