Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ParcelableHolder shouldn't write anything for empty case"

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-26 02:39:54 +00:00
committed by Gerrit Code Review
parent 768384c661 3f5ffa615a
commit 97c2606bbd
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/os/ParcelableHolder.java
View File

@@ -170,16 +170,21 @@ public final class ParcelableHolder implements Parcelable {
mParcelable = null;
int dataSize = parcel.readInt();
if (dataSize < 0) {
throw new IllegalArgumentException("dataSize from parcel is negative");
} else if (dataSize == 0) {
if (mParcel != null) {
mParcel.recycle();
mParcel = null;
}
return;
}
if (mParcel == null) {
mParcel = Parcel.obtain();
}
mParcel.setDataPosition(0);
mParcel.setDataSize(0);
int dataSize = parcel.readInt();
if (dataSize < 0) {
throw new IllegalArgumentException("dataSize from parcel is negative");
}
int dataStartPos = parcel.dataPosition();
mParcel.appendFrom(parcel, dataStartPos, dataSize);
@@ -196,6 +201,11 @@ public final class ParcelableHolder implements Parcelable {
return;
}
if (mParcelable == null) {
parcel.writeInt(0);
return;
}
int sizePos = parcel.dataPosition();
parcel.writeInt(0);
int dataStartPos = parcel.dataPosition();