commit ba87e1a1de232815e72b59b90a3a406725e15fc5
author Jeongik Cha <jeongik@google.com> Wed Dec 15 02:08:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 15 02:08:17 2021 +0000
tree 2dadec8ac16b20bbfdc946a61c35a5c6d5fb5182
parent 6e7f072d8a660d3cebde24b46d32041ee16b866c
parent 4e243f3abb3d92c3bc31723db5fb3dc0f86ddb0f

Merge "Add copy ctor for ParcelableHolder"

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;