commit 911e500a8b00b7c786b0e5f91bd026c800d918c7
author Devin Moore <devinmoore@google.com> Tue Dec 19 00:37:11 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 19 00:37:11 2023 +0000
tree a9518a2d635c395ca46d16fdb4ad410769df47b6
parent 1f2c1c561ab7fdbe5f7805924d255d03d17fdd0c
parent f696a98863d628fcb3617887e7595e6c44a22b1c

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

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

Change-Id: Ie3e28830461e547b6b90ea38c4c2f46cfaf54342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/nativewindow/include/android/native_window_aidl.h

diff --git a/libs/nativewindow/include/android/native_window_aidl.h b/libs/nativewindow/include/android/native_window_aidl.h
index a252245..78f7590 100644
--- a/libs/nativewindow/include/android/native_window_aidl.h
+++ b/libs/nativewindow/include/android/native_window_aidl.h
@@ -97,14 +97,22 @@
 
     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;
+        }
     }
 
     /**