diff options
| author | 2013-01-11 18:27:59 -0800 | |
|---|---|---|
| committer | 2013-01-11 18:28:12 -0800 | |
| commit | 369da18ffb8686f66bcbe081419bd4b1aa31442c (patch) | |
| tree | 36d9086e18d48589c5e4c54de2a0ee43a6f99122 | |
| parent | 5ae8e45ff390d660c5694f27e2df14cf7b8fb81d (diff) | |
| parent | 97a72f6693a7bee3255b2307c6bb18f66669a36c (diff) | |
Merge "Handle missing static for CREATOR"
| -rw-r--r-- | core/java/android/os/Parcel.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 788ab7401cc6..d69fef0b7249 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -2087,6 +2087,10 @@ public final class Parcel { + "Parcelable.Creator object called " + " CREATOR on class " + name); } + catch (NullPointerException e) { + throw new BadParcelableException("Parcelable protocol requires " + + "the CREATOR object to be static on class " + name); + } if (creator == null) { throw new BadParcelableException("Parcelable protocol requires a " + "Parcelable.Creator object called " |