commit 4e243f3abb3d92c3bc31723db5fb3dc0f86ddb0f
author Jeongik Cha <jeongik@google.com> Fri Dec 10 07:02:22 2021 +0000
committer Jeongik Cha <jeongik@google.com> Mon Dec 13 06:21:11 2021 +0000
tree 78238a7594e61184f7b67fafe0b5d9c7a3d6dc6d
parent 305af2eb093c09b4bc8efd7f24ab47f66be199ab

Add copy ctor for ParcelableHolder

For the parity with other parcelable, make ParcelableHolder copyable, so
that a parcelable which contains ParcelableHolder can be copyable.

Bug: 209872866
Bug: 210093811
Test: declare a parcelable array which contains ParcelableHolder and
then check if build succeeds

Change-Id: I80c2c544f12c5ace261612b35a1aa187bfe96214

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

diff --git a/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h b/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h
index aa3b978..972eca7 100644
--- a/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h
+++ b/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h
@@ -46,6 +46,18 @@
     AParcelableHolder() = delete;
     explicit AParcelableHolder(parcelable_stability_t stability)
         : mParcel(AParcel_create()), mStability(stability) {}
+
+#if __ANDROID_API__ >= 31
+    AParcelableHolder(const AParcelableHolder& other)
+        : mParcel(AParcel_create()), mStability(other.mStability) {
+        // AParcelableHolder has been introduced in 31.
+        if (__builtin_available(android 31, *)) {
+            AParcel_appendFrom(other.mParcel.get(), this->mParcel.get(), 0,
+                               AParcel_getDataSize(other.mParcel.get()));
+        }
+    }
+#endif
+
     AParcelableHolder(AParcelableHolder&& other) = default;
     virtual ~AParcelableHolder() = default;