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

Commit 911e500a authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Check builtin_available for ndk calls in AIDL native window" into main... 

Merge "Check builtin_available for ndk calls in AIDL native window" into main am: 565af6b1 am: f696a988

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



Change-Id: Ie3e28830461e547b6b90ea38c4c2f46cfaf54342
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f2c1c56 f696a988

libs/nativewindow/include/android/native_window_aidl.h

+10 −2
Original line number Diff line number Diff line
@@ -97,14 +97,22 @@ public: 


    binder_status_t readFromParcel(const AParcel* _Nonnull parcel) {

        reset();

        if (__builtin_available(android __ANDROID_API_U__, *)) {

            return ANativeWindow_readFromParcel(parcel, &mWindow);

        } else {

            return STATUS_FAILED_TRANSACTION;

        }

    }



    binder_status_t writeToParcel(AParcel* _Nonnull parcel) const {

        if (!mWindow) {

            return STATUS_BAD_VALUE;

        }

        if (__builtin_available(android __ANDROID_API_U__, *)) {

            return ANativeWindow_writeToParcel(mWindow, parcel);

        } else {

            return STATUS_FAILED_TRANSACTION;

        }

    }



    /**