From 74284663fce6de2353cf971ddd479661cf7e50ab Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Mon, 18 Dec 2023 19:25:51 +0000 Subject: Check builtin_available for ndk calls in AIDL native window These NDK APIs may not be available for modules using this AIDL type on older devices. Test: m Bug: none Change-Id: I0048285e4bd4d708833704845bed2199800bf42c --- libs/nativewindow/include/android/native_window_aidl.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/nativewindow/include/android/native_window_aidl.h b/libs/nativewindow/include/android/native_window_aidl.h index a252245a10..78f7590993 100644 --- a/libs/nativewindow/include/android/native_window_aidl.h +++ b/libs/nativewindow/include/android/native_window_aidl.h @@ -97,14 +97,22 @@ public: binder_status_t readFromParcel(const AParcel* _Nonnull parcel) { reset(); - return ANativeWindow_readFromParcel(parcel, &mWindow); + 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; } - return ANativeWindow_writeToParcel(mWindow, parcel); + if (__builtin_available(android __ANDROID_API_U__, *)) { + return ANativeWindow_writeToParcel(mWindow, parcel); + } else { + return STATUS_FAILED_TRANSACTION; + } } /** -- cgit v1.2.3-59-g8ed1b