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

Commit 40a34f25 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "camera: Remove session_hal_buf_manager flag" into main

parents 9f39f1a7 1e8654fe

camera/provider/aidl/vts/camera_aidl_test.cpp

+3 −5
Original line number Diff line number Diff line
@@ -2590,8 +2590,7 @@ ndk::ScopedAStatus CameraAidlTest::configureStreams(std::shared_ptr<ICameraDevic 
        return ret;

    }



    if (flags::session_hal_buf_manager() &&

        (bufferManagerType == BufferManagerType::SESSION && interfaceVersion >= 3)) {

    if (bufferManagerType == BufferManagerType::SESSION && interfaceVersion >= 3) {

        ret = session->configureStreamsV2(config, &aidl_return);

    } else {

        ret = session->configureStreams(config, halStreams);
@@ -2599,12 +2598,11 @@ ndk::ScopedAStatus CameraAidlTest::configureStreams(std::shared_ptr<ICameraDevic 
    if (!ret.isOk()) {

        return ret;

    }

    if (flags::session_hal_buf_manager() && bufferManagerType == BufferManagerType::SESSION) {

    if (bufferManagerType == BufferManagerType::SESSION) {

        *halStreams = std::move(aidl_return.halStreams);

    }

    for (const auto& halStream : *halStreams) {

        if ((flags::session_hal_buf_manager() && bufferManagerType == BufferManagerType::SESSION &&

             halStream.enableHalBufferManager) ||

        if ((bufferManagerType == BufferManagerType::SESSION && halStream.enableHalBufferManager) ||

            bufferManagerType == BufferManagerType::HAL) {

            halBufManagedStreamIds->insert(halStream.id);

        }