Merge "setParcelable uses const ref instead of pointer" (e42a54b1) · Commits · e / os / android_frameworks_native

libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -82,13 +82,13 @@ class AParcelableHolder {
		}

		template <typename T>
		bool setParcelable(T* p) {
		if (p && this->mStability > T::_aidl_stability) {
		bool setParcelable(const T& p) {
		if (this->mStability > T::_aidl_stability) {
		return false;
		}
		AParcel_reset(mParcel.get());
		AParcel_writeString(mParcel.get(), T::descriptor, strlen(T::descriptor));
		p->writeToParcel(mParcel.get());
		p.writeToParcel(mParcel.get());
		return true;
		}

		@@ -112,6 +112,8 @@ class AParcelableHolder {
		return std::move(ret);
		}

		void reset() { AParcel_reset(mParcel.get()); }

		private:
		mutable ndk::ScopedAParcel mParcel;
		parcelable_stability_t mStability;