Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e42a54b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "setParcelable uses const ref instead of pointer"

parents 80315724 12623df4
Loading
Loading
Loading
Loading
+5 −3
Original line number Original line Diff line number Diff line
@@ -82,13 +82,13 @@ class AParcelableHolder {
    }
    }


    template <typename T>
    template <typename T>
    bool setParcelable(T* p) {
    bool setParcelable(const T& p) {
        if (p && this->mStability > T::_aidl_stability) {
        if (this->mStability > T::_aidl_stability) {
            return false;
            return false;
        }
        }
        AParcel_reset(mParcel.get());
        AParcel_reset(mParcel.get());
        AParcel_writeString(mParcel.get(), T::descriptor, strlen(T::descriptor));
        AParcel_writeString(mParcel.get(), T::descriptor, strlen(T::descriptor));
        p->writeToParcel(mParcel.get());
        p.writeToParcel(mParcel.get());
        return true;
        return true;
    }
    }


@@ -112,6 +112,8 @@ class AParcelableHolder {
        return std::move(ret);
        return std::move(ret);
    }
    }


    void reset() { AParcel_reset(mParcel.get()); }

   private:
   private:
    mutable ndk::ScopedAParcel mParcel;
    mutable ndk::ScopedAParcel mParcel;
    parcelable_stability_t mStability;
    parcelable_stability_t mStability;