diff options
| author | 2020-10-21 12:19:48 +0000 | |
|---|---|---|
| committer | 2020-10-21 12:19:48 +0000 | |
| commit | 71927a2d053e46a5b4a1efdd3abbbbb08fe9713f (patch) | |
| tree | 05893b6ffec4d4d52b01c97a5c8ea3182ab42066 /libs/binder/ParcelableHolder.cpp | |
| parent | 3f6d6cdc3df547358feb742c4b62f881514b20ab (diff) | |
| parent | 143cc99114045e087031b368603ff4c1b0d30cc4 (diff) | |
Merge "Remove the lock in ParcelableHolder" am: 13f4350a01 am: 735ee66377 am: 143cc99114
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1467062
Change-Id: I1b8f67c6532b8a2e777bd980cfaf6390672e81ac
Diffstat (limited to 'libs/binder/ParcelableHolder.cpp')
| -rw-r--r-- | libs/binder/ParcelableHolder.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/binder/ParcelableHolder.cpp b/libs/binder/ParcelableHolder.cpp index e9df27976c..b2b86716d5 100644 --- a/libs/binder/ParcelableHolder.cpp +++ b/libs/binder/ParcelableHolder.cpp @@ -27,7 +27,6 @@ namespace android { namespace os { status_t ParcelableHolder::writeToParcel(Parcel* p) const { - std::lock_guard<std::mutex> l(mMutex); RETURN_ON_FAILURE(p->writeInt32(static_cast<int32_t>(this->getStability()))); if (this->mParcelPtr) { RETURN_ON_FAILURE(p->writeInt32(this->mParcelPtr->dataSize())); @@ -53,7 +52,6 @@ status_t ParcelableHolder::writeToParcel(Parcel* p) const { } status_t ParcelableHolder::readFromParcel(const Parcel* p) { - std::lock_guard<std::mutex> l(mMutex); this->mStability = static_cast<Stability>(p->readInt32()); this->mParcelable = nullptr; this->mParcelableName = std::nullopt; |