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

Commit 3e9ad577 authored by Frederick Mayle's avatar Frederick Mayle Committed by Automerger Merge Worker
Browse files

Merge "binder: Don't use reinterpret_cast to down cast" am: 171a64a8 am:... 

Merge "binder: Don't use reinterpret_cast to down cast" am: 171a64a8 am: 2ed96159 am: 47266662 am: cbd886a1

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



Change-Id: I93da1588a7e794a1fb7a9b3941258dbda07d9b53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5922ba5e cbd886a1

libs/binder/include/binder/ParcelableHolder.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ public: 
                *ret = nullptr;

                *ret = nullptr;

                return android::BAD_VALUE;

                return android::BAD_VALUE;

            }

            }

            *ret = std::shared_ptr<T>(mParcelable, reinterpret_cast<T*>(mParcelable.get()));

            *ret = std::static_pointer_cast<T>(mParcelable);

            return android::OK;

            return android::OK;

        }

        }

        this->mParcelPtr->setDataPosition(0);

        this->mParcelPtr->setDataPosition(0);
@@ -105,7 +105,7 @@ public: 
            return status;

            return status;

        }

        }

        this->mParcelPtr = nullptr;

        this->mParcelPtr = nullptr;

        *ret = std::shared_ptr<T>(mParcelable, reinterpret_cast<T*>(mParcelable.get()));

        *ret = std::static_pointer_cast<T>(mParcelable);

        return android::OK;

        return android::OK;

    }

    }