Parcel: readValue harder error

Bug: 384586487
Test: boot
Change-Id: Ifa8b7551246a485f3622bb223ce0aec45dd178ac

1 files changed, 5 insertions, 3 deletions

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 4aa74621bd62..3c4139d39762 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -4623,9 +4623,11 @@ public final class Parcel {
             object = readValue(type, loader, clazz, itemTypes);
             int actual = dataPosition() - start;
             if (actual != length) {
-                Slog.wtfStack(TAG,
-                        "Unparcelling of " + object + " of type " + Parcel.valueTypeToString(type)
-                                + "  consumed " + actual + " bytes, but " + length + " expected.");
+                String error = "Unparcelling of " + object + " of type "
+                                + Parcel.valueTypeToString(type) + "  consumed " + actual
+                                + " bytes, but " + length + " expected.";
+                Slog.wtfStack(TAG, error);
+                throw new BadParcelableException(error);
             }
         } else {
             object = readValue(type, loader, clazz, itemTypes);