commit e5f2e506161fd9f4ef021085774e426db6361320
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 13 22:25:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 13 22:25:16 2021 +0000
tree 08226d0dc8cab8bbe636115ef08460796b1fbc12
parent df1a5272b16af257cb031037bdfa68b79c50face
parent 5e3a64928f912ec64469670074ff09723a3bd137

Merge "binder_ndk: fix read/write interface" am: eb05acaa43 am: af5fc3ca6f am: 5e3a64928f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1900588

Change-Id: I58d52ec268aa2c4e485fc8b21a3c2bb12ac65e69

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

diff --git a/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h b/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h
index c1487c0..e5560f8 100644
--- a/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h
+++ b/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h
@@ -482,9 +482,7 @@
 template <typename P>
 static inline binder_status_t AParcel_writeParcelable(AParcel* parcel, const P& p) {
     if constexpr (is_interface_v<P>) {
-        if (!p) {
-            return STATUS_UNEXPECTED_NULL;
-        }
+        // Legacy behavior: allow null
         return first_template_type_t<P>::writeToParcel(parcel, p);
     } else {
         static_assert(is_parcelable_v<P>);
@@ -502,13 +500,8 @@
 template <typename P>
 static inline binder_status_t AParcel_readParcelable(const AParcel* parcel, P* p) {
     if constexpr (is_interface_v<P>) {
-        binder_status_t status = first_template_type_t<P>::readFromParcel(parcel, p);
-        if (status == STATUS_OK) {
-            if (!*p) {
-                return STATUS_UNEXPECTED_NULL;
-            }
-        }
-        return status;
+        // Legacy behavior: allow null
+        return first_template_type_t<P>::readFromParcel(parcel, p);
     } else {
         static_assert(is_parcelable_v<P>);
         int32_t null;