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

Commit b5480c58 authored by Jyoti Bhayana's avatar Jyoti Bhayana Committed by Android (Google) Code Review
Browse files

Merge "Camera2 multi-client" into main

parents fee561ce e54b48f7

services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp

+2 −1
Original line number Diff line number Diff line
@@ -769,7 +769,8 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 


    std::filesystem::path sharedSessionConfigFilePath =

            std::string(SHARED_SESSION_FILE_PATH) + std::string(SHARED_SESSION_FILE_NAME);

    if (flags::camera_multi_client() && std::filesystem::exists(sharedSessionConfigFilePath)) {

    if (flags::camera_multi_client() && std::filesystem::exists(sharedSessionConfigFilePath)

            && mSystemCameraKind == SystemCameraKind::SYSTEM_ONLY_CAMERA) {

        addSharedSessionConfigurationTags(id);

    }