commit 2350502a959c4c78346e8fe18840f42a79262de1
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 24 01:03:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 24 01:03:16 2020 +0000
tree 99794ba792fc06afb7ce7f08b19b165287c7749c
parent 043e9a33566dd4c7da966921e0cdbf4c93af04b5
parent e42a54b17768ea80f198c1b00bc6c4797a4485d8

Merge "setParcelable uses const ref instead of pointer" am: e42a54b177

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

Change-Id: Iaf238e3cd9bd078bb83197ff283c98710b63f7bd

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;