| commit | 47266662963a0ea144367eb2183faa46a26e817d | [log] [tgz] |
|---|---|---|
| author | Frederick Mayle <fmayle@google.com> | Fri Mar 25 23:18:33 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 25 23:18:33 2022 +0000 |
| tree | 53afc741923d9a145a222697776327ac7628c4fb | |
| parent | ad964d46504a0ecb2e26a6111fd70c8f7e6c3f7c [diff] | |
| parent | 2ed961592f01aeb8af19867dca373273a6d1f291 [diff] |
Merge "binder: Don't use reinterpret_cast to down cast" am: 171a64a823 am: 2ed961592f Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2043432 Change-Id: If09317caa84d6d9f9dc571d309aff90b0e0470db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/include/binder/ParcelableHolder.h b/libs/binder/include/binder/ParcelableHolder.h index 42c85f9..88790a8 100644 --- a/libs/binder/include/binder/ParcelableHolder.h +++ b/libs/binder/include/binder/ParcelableHolder.h
@@ -86,7 +86,7 @@ *ret = nullptr; 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; } this->mParcelPtr->setDataPosition(0); @@ -105,7 +105,7 @@ return status; } this->mParcelPtr = nullptr; - *ret = std::shared_ptr<T>(mParcelable, reinterpret_cast<T*>(mParcelable.get())); + *ret = std::static_pointer_cast<T>(mParcelable); return android::OK; }