diff options
| author | 2023-12-19 01:10:50 +0000 | |
|---|---|---|
| committer | 2023-12-19 01:10:50 +0000 | |
| commit | 65e0943e34dbf576989aed1b97a9f4870afe6aa5 (patch) | |
| tree | 51beb5b43f1c7eb40fa476e2b25f79a712d38ece | |
| parent | 5d7cefd44eda231297e51ea1a0bdfdae1dcee701 (diff) | |
| parent | 911e500a8b00b7c786b0e5f91bd026c800d918c7 (diff) | |
Merge "Check builtin_available for ndk calls in AIDL native window" into main am: 565af6b109 am: f696a98863 am: 911e500a8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2880408
Change-Id: I9bb34ac43d823e440ca9257c81c4f3a985245b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/nativewindow/include/android/native_window_aidl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/nativewindow/include/android/native_window_aidl.h b/libs/nativewindow/include/android/native_window_aidl.h index 0d5727d0e6..68ac7e0b34 100644 --- a/libs/nativewindow/include/android/native_window_aidl.h +++ b/libs/nativewindow/include/android/native_window_aidl.h @@ -103,14 +103,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; + } } /** |