Merge "libbinder_ndk: support for nullable parcelables" am: 56ef5878bf am:... (f4169dd8) · Commits · e / os / android_frameworks_native-old

libs/binder/ndk/include_ndk/android/binder_parcel_utils.h

+35 −0

Original line number	Original line	Diff line number	Diff line
	@@ -448,6 +448,41 @@ static inline binder_status_t AParcel_readParcelable(const AParcel* parcel, P* p
	return p->readFromParcel(parcel);		return p->readFromParcel(parcel);
	}		}

			/**
			* Convenience API for writing a nullable parcelable.
			*/
			template <typename P>
			static inline binder_status_t AParcel_writeNullableParcelable(AParcel* parcel,
			const std::optional<P>& p) {
			if (p == std::nullopt) {
			return AParcel_writeInt32(parcel, 0); // null
			}
			binder_status_t status = AParcel_writeInt32(parcel, 1); // non-null
			if (status != STATUS_OK) {
			return status;
			}
			return p->writeToParcel(parcel);
			}

			/**
			* Convenience API for reading a nullable parcelable.
			*/
			template <typename P>
			static inline binder_status_t AParcel_readNullableParcelable(const AParcel* parcel,
			std::optional<P>* p) {
			int32_t null;
			binder_status_t status = AParcel_readInt32(parcel, &null);
			if (status != STATUS_OK) {
			return status;
			}
			if (null == 0) {
			*p = std::nullopt;
			return STATUS_OK;
			}
			*p = std::optional<P>(P{});
			return (*p)->readFromParcel(parcel);
			}

	/**		/**
	* Writes a parcelable object of type P inside a std::vector<P> at index 'index' to 'parcel'.		* Writes a parcelable object of type P inside a std::vector<P> at index 'index' to 'parcel'.
	*/		*/