commit d853f16c599ff7205f091e87535e7f8a75a85f9b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 24 02:38:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 24 02:38:22 2020 +0000
tree f7c4e9e17b5f3907e10d6ae886b909ea9d79e5bb
parent 615f465c27abfde038824f3ba4c7aeb65a5db905
parent d4a8d8716dc21d814bbdad0460ffbbb54b0c1063

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

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

Change-Id: I5c850f2cf77f4d040ecbe8891498786bce01cd97

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;