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

Commit 3ff1417e authored by John Reck's avatar John Reck
Browse files

Track API council feedback 

Fixes: 319284591
Test: make && atest libnativewindow_test
Change-Id: I7d6521ff43bf7a79dc6c6e45610108b82e469dc8
parent 203b22aa

libs/nativewindow/AHardwareBuffer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ int AHardwareBuffer_createFromHandle(const AHardwareBuffer_Desc* desc, 
    return NO_ERROR;

    return NO_ERROR;

}

}





enum AHardwareBufferStatus AHardwareBuffer_allocate2(

enum AHardwareBufferStatus AHardwareBuffer_allocateWithOptions(

        const AHardwareBuffer_Desc* desc, const AHardwareBufferLongOptions* additionalOptions,

        const AHardwareBuffer_Desc* desc, const AHardwareBufferLongOptions* additionalOptions,

        size_t additionalOptionsSize, AHardwareBuffer** outBuffer) {

        size_t additionalOptionsSize, AHardwareBuffer** outBuffer) {

    (void)additionalOptions;

    (void)additionalOptions;

libs/nativewindow/include/vndk/hardware_buffer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ enum AHardwareBufferStatus : int32_t { 
 *         AHARDWAREBUFFER_STATUS_UNKNOWN_ERROR for any other error

 *         AHARDWAREBUFFER_STATUS_UNKNOWN_ERROR for any other error

 * any reason. The returned buffer has a reference count of 1.

 * any reason. The returned buffer has a reference count of 1.

 */

 */

enum AHardwareBufferStatus AHardwareBuffer_allocate2(

enum AHardwareBufferStatus AHardwareBuffer_allocateWithOptions(

        const AHardwareBuffer_Desc* _Nonnull desc,

        const AHardwareBuffer_Desc* _Nonnull desc,

        const AHardwareBufferLongOptions* _Nullable additionalOptions, size_t additionalOptionsSize,

        const AHardwareBufferLongOptions* _Nullable additionalOptions, size_t additionalOptionsSize,

        AHardwareBuffer* _Nullable* _Nonnull outBuffer) __INTRODUCED_IN(__ANDROID_API_V__);

        AHardwareBuffer* _Nullable* _Nonnull outBuffer) __INTRODUCED_IN(__ANDROID_API_V__);

libs/nativewindow/libnativewindow.map.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ LIBNATIVEWINDOW { 
  global:

  global:

    AHardwareBuffer_acquire;

    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_allocate;

    AHardwareBuffer_allocate2; # llndk systemapi

    AHardwareBuffer_allocateWithOptions; # llndk systemapi

    AHardwareBuffer_createFromHandle; # llndk systemapi

    AHardwareBuffer_createFromHandle; # llndk systemapi

    AHardwareBuffer_describe;

    AHardwareBuffer_describe;

    AHardwareBuffer_getId; # introduced=31

    AHardwareBuffer_getId; # introduced=31

libs/nativewindow/tests/AHardwareBufferTest.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -188,7 +188,7 @@ TEST(AHardwareBufferTest, Allocate2NoExtras) { 
    };

    };





    AHardwareBuffer* buffer = nullptr;

    AHardwareBuffer* buffer = nullptr;

    ASSERT_EQ(0, AHardwareBuffer_allocate2(&desc, nullptr, 0, &buffer));

    ASSERT_EQ(0, AHardwareBuffer_allocateWithOptions(&desc, nullptr, 0, &buffer));

    uint64_t id = 0;

    uint64_t id = 0;

    EXPECT_EQ(0, AHardwareBuffer_getId(buffer, &id));

    EXPECT_EQ(0, AHardwareBuffer_getId(buffer, &id));

    EXPECT_NE(0, id);

    EXPECT_NE(0, id);
@@ -219,7 +219,7 @@ TEST(AHardwareBufferTest, Allocate2WithExtras) { 
    std::array<AHardwareBufferLongOptions, 1> extras = {{

    std::array<AHardwareBufferLongOptions, 1> extras = {{

            {.name = "android.hardware.graphics.common.Dataspace", ADATASPACE_DISPLAY_P3},

            {.name = "android.hardware.graphics.common.Dataspace", ADATASPACE_DISPLAY_P3},

    }};

    }};

    ASSERT_EQ(0, AHardwareBuffer_allocate2(&desc, extras.data(), extras.size(), &buffer));

    ASSERT_EQ(0, AHardwareBuffer_allocateWithOptions(&desc, extras.data(), extras.size(), &buffer));

    uint64_t id = 0;

    uint64_t id = 0;

    EXPECT_EQ(0, AHardwareBuffer_getId(buffer, &id));

    EXPECT_EQ(0, AHardwareBuffer_getId(buffer, &id));

    EXPECT_NE(0, id);

    EXPECT_NE(0, id);