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

Commit fe185541 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "Protect AHardwareBuffer API calls with __builtin_available" into main... 

Merge "Protect AHardwareBuffer API calls with __builtin_available" into main am: 2bce819d am: d8606ef3 am: 1f1b0b8c am: 09de6e16

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2730939



Change-Id: Idd5294e80aed0897117a26780f44ba078dd61d75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8fcbd5e0 09de6e16

libs/nativewindow/include/android/hardware_buffer_aidl.h

+17 −5
Original line number Diff line number Diff line
@@ -95,14 +95,22 @@ public: 


    binder_status_t readFromParcel(const AParcel* _Nonnull parcel) {

        reset();

        if (__builtin_available(android __ANDROID_API_U__, *)) {

            return AHardwareBuffer_readFromParcel(parcel, &mBuffer);

        } else {

            return STATUS_FAILED_TRANSACTION;

        }

    }



    binder_status_t writeToParcel(AParcel* _Nonnull parcel) const {

        if (!mBuffer) {

            return STATUS_BAD_VALUE;

        }

        if (__builtin_available(android __ANDROID_API_U__, *)) {

            return AHardwareBuffer_writeToParcel(mBuffer, parcel);

        } else {

            return STATUS_FAILED_TRANSACTION;

        }

    }



    /**
@@ -150,9 +158,13 @@ public: 
        if (!mBuffer) {

            return "<HardwareBuffer: Invalid>";

        }

        if (__builtin_available(android __ANDROID_API_S__, *)) {

            uint64_t id = 0;

            AHardwareBuffer_getId(mBuffer, &id);

            return "<HardwareBuffer " + std::to_string(id) + ">";

        } else {

            return "<HardwareBuffer (unknown)>";

        }

    }



private: