commit 12623df409ab8ada80e344ca852bdbc41736adb4
author Jeongik Cha <jeongik@google.com> Tue Nov 24 00:17:03 2020 +0900
committer Jeongik Cha <jeongik@google.com> Mon Nov 23 15:23:10 2020 +0000
tree 988eed993912fc2dbda02adfcd1ffa57af6439de
parent d9d4ed6c1737eec03a68d0d8059d6dabebdc0c83

setParcelable uses const ref instead of pointer

ParcelableHolder for NDK backend doesn't store raw parcelable, so it
doesn't need pointer as argument. So just let it const ref, and add
reset() method for clearing the object.

Test: atest CtsNdkBinderTestCases
Bug: 173682656
Change-Id: I402e4e832585aba62d254f1c603c29454013d3c4

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 dfcf4dc..4858514 100644
--- a/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h
+++ b/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h
@@ -82,13 +82,13 @@
     }
 
     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 @@
         return std::move(ret);
     }
 
+    void reset() { AParcel_reset(mParcel.get()); }
+
    private:
     mutable ndk::ScopedAParcel mParcel;
     parcelable_stability_t mStability;