Merge "Revert "Parcel: readValue harder error"" into main (e9caafcc) · Commits · e / os / android_frameworks_base

core/java/android/os/Parcel.java

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4702,11 +4702,9 @@ public final class Parcel {
	object = readValue(type, loader, clazz, itemTypes);		object = readValue(type, loader, clazz, itemTypes);
	int actual = dataPosition() - start;		int actual = dataPosition() - start;
	if (actual != length) {		if (actual != length) {
	String error = "Unparcelling of " + object + " of type "		Slog.wtfStack(TAG,
	+ Parcel.valueTypeToString(type) + " consumed " + actual		"Unparcelling of " + object + " of type " + Parcel.valueTypeToString(type)
	+ " bytes, but " + length + " expected.";		+ " consumed " + actual + " bytes, but " + length + " expected.");
	Slog.wtfStack(TAG, error);
	throw new BadParcelableException(error);
	}		}
	} else {		} else {
	object = readValue(type, loader, clazz, itemTypes);		object = readValue(type, loader, clazz, itemTypes);