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

Commit 7fceb532 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12224018 from 9af4fc9b to 24Q4-release 

Change-Id: I55269824670a500ae7ca963c6dcf775fb70eb4b4
parents 0773c105 9af4fc9b

camera/device/aidl/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ aidl_interface { 
            sdk_version: "module_current",

            enabled: false,

        },

        rust: {

            enabled: true,

        },

    },

    versions_with_info: [

        {

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

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <android/hardware/camera/provider/2.7/ICameraProvider.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <binder/MemoryHeapBase.h>

#include <com_android_graphics_libgui_flags.h>

#include <cutils/properties.h>

#include <fmq/MessageQueue.h>

#include <grallocusage/GrallocUsageConversion.h>
@@ -8714,16 +8715,25 @@ void CameraHidlTest::setupPreviewWindow( 
    ASSERT_NE(nullptr, bufferItemConsumer);

    ASSERT_NE(nullptr, bufferHandler);



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    *bufferItemConsumer = new BufferItemConsumer(

            GraphicBuffer::USAGE_HW_TEXTURE);  // Use GLConsumer default usage flags

#else

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    *bufferItemConsumer = new BufferItemConsumer(consumer,

            GraphicBuffer::USAGE_HW_TEXTURE); //Use GLConsumer default usage flags

#endif  // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    ASSERT_NE(nullptr, (*bufferItemConsumer).get());

    *bufferHandler = new BufferItemHander(*bufferItemConsumer);

    ASSERT_NE(nullptr, (*bufferHandler).get());

    (*bufferItemConsumer)->setFrameAvailableListener(*bufferHandler);

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<Surface> surface = (*bufferItemConsumer)->getSurface();

#else

    sp<Surface> surface = new Surface(producer);

#endif  // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<PreviewWindowCb> previewCb = new PreviewWindowCb(surface);



    auto rc = device->setPreviewWindow(previewCb);

camera/provider/aidl/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        rust: {

            enabled: true,

        },

    },

    versions_with_info: [

        {

compatibility_matrices/compatibility_matrix.202504.xml

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ 
    </hal>

    <hal format="aidl">

        <name>android.hardware.graphics.composer3</name>

        <version>3</version>

        <version>4</version>

        <interface>

            <name>IComposer</name>

            <instance>default</instance>

graphics/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ cc_defaults { 
cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_static",

    static_libs: [

        "android.hardware.graphics.composer3-V3-ndk",

        "android.hardware.graphics.composer3-V4-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_shared",

    shared_libs: [

        "android.hardware.graphics.composer3-V3-ndk",

        "android.hardware.graphics.composer3-V4-ndk",

    ],

}