diff options
| author | 2023-12-19 00:05:40 +0000 | |
|---|---|---|
| committer | 2023-12-19 00:05:40 +0000 | |
| commit | f696a98863d628fcb3617887e7595e6c44a22b1c (patch) | |
| tree | 6854a6129d32db39af2533b330e0698b639dacd4 | |
| parent | a495ef9f84bad76f89f9c80dda314776edb7427c (diff) | |
| parent | 565af6b10907420056562ab6c3f1bc72affc2807 (diff) | |
Merge "Check builtin_available for ndk calls in AIDL native window" into main am: 565af6b109
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2880408
Change-Id: I2e01d7d2d7626904f8562ece620f6f4244d26362
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 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; + } } /** |