Merge "ParcelableHolder shouldn't write anything for empty case" (97c2606b) · Commits · e / os / android_frameworks_base

core/java/android/os/ParcelableHolder.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -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();