diff options
| author | 2020-10-21 11:57:09 +0000 | |
|---|---|---|
| committer | 2020-10-21 11:57:09 +0000 | |
| commit | 143cc99114045e087031b368603ff4c1b0d30cc4 (patch) | |
| tree | f4f514e3b38a38e853e8386b922e9dacd5766dac /libs/binder/ParcelableHolder.cpp | |
| parent | a0b8c26b57d4f5700f5348c203e1afdc7bd0c516 (diff) | |
| parent | 735ee66377a621cbf918caf399bcffbfa5417e77 (diff) | |
Merge "Remove the lock in ParcelableHolder" am: 13f4350a01 am: 735ee66377
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1467062
Change-Id: I3101370834b9ab78e7821a99be57afaad7f5f1a0
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; |