Merge "Check builtin_available for ndk calls in AIDL native window" into main (565af6b1) · Commits · e / os / android_frameworks_native

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;
		}
		}

		/**