| commit | 30154ac94210281363717533fbcf872a145bc62d | [log] [tgz] |
|---|---|---|
| author | Jeongik Cha <jeongik@google.com> | Wed Dec 15 03:03:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 15 03:03:05 2021 +0000 |
| tree | aa598254a5395da47f12bac8ba5b3e7d3c48136f | |
| parent | 170ea0c046173a0cfc680902213d595eb1abd713 [diff] | |
| parent | 3028ac77eb04e2f4e88f3366ca0bc053be658d4e [diff] |
Merge "Add copy ctor for ParcelableHolder" am: ba87e1a1de am: 4438fc6959 am: 3028ac77eb Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1917358 Change-Id: I127693ee9bd87cd416bda53e84751837fdf4cee6
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;