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

Commit 1b909f48 authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bufferpool2-V2" into main am: 04b5d667 

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



Change-Id: I57a1376249dbab5adf617d51f1b05eb0f6f0500e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5edd8f2b 04b5d667

media/bufferpool/aidl/default/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -33,15 +33,16 @@ cc_library { 
        "libcutils",

        "libfmq",

        "liblog",

        "libnativewindow",

        "libutils",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

    ],

    static_libs: [

        "libaidlcommonsupport",

    ],

    export_shared_lib_headers: [

        "libfmq",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

    ],

    double_loadable: true,

    cflags: [

media/bufferpool/aidl/default/BufferPoolClient.cpp

+7 −1
Original line number Diff line number Diff line
@@ -757,7 +757,13 @@ BufferPoolStatus BufferPoolClient::Impl::fetchBufferHandle( 
        return svcSpecific ? svcSpecific : ResultStatus::CRITICAL_ERROR;

    }

    if (results[0].getTag() == FetchResult::buffer) {

        *handle = ::android::dupFromAidl(results[0].get<FetchResult::buffer>().buffer);

        if (results[0].get<FetchResult::buffer>().buffer.has_value()) {

            *handle = ::android::dupFromAidl(results[0].get<FetchResult::buffer>().buffer.value());

        } else {

            // TODO: Support HardwareBuffer

            ALOGW("handle nullptr");

            *handle = nullptr;

        }

        return ResultStatus::OK;

    }

    return results[0].get<FetchResult::failure>();

media/bufferpool/aidl/default/tests/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ cc_test { 
        "libcutils",

        "libfmq",

        "liblog",

        "libnativewindow",

        "libutils",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

    ],

    static_libs: [

        "libaidlcommonsupport",
@@ -59,8 +60,9 @@ cc_test { 
        "libcutils",

        "libfmq",

        "liblog",

        "libnativewindow",

        "libutils",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

    ],

    static_libs: [

        "libaidlcommonsupport",
@@ -82,8 +84,9 @@ cc_test { 
        "libcutils",

        "libfmq",

        "liblog",

        "libnativewindow",

        "libutils",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

    ],

    static_libs: [

        "libaidlcommonsupport",

media/c2/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ aidl_interface { 
    ],

    imports: [

        "android.hardware.common-V2",

        "android.hardware.media.bufferpool2-V1",

        "android.hardware.media.bufferpool2-V2",

    ],

    include_dirs: [

        "frameworks/native/aidl/gui",