commit 369da18ffb8686f66bcbe081419bd4b1aa31442c
author Irfan Sheriff <isheriff@google.com> Fri Jan 11 18:27:59 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 11 18:28:12 2013 -0800
tree 36d9086e18d48589c5e4c54de2a0ee43a6f99122
parent 5ae8e45ff390d660c5694f27e2df14cf7b8fb81d
parent 97a72f6693a7bee3255b2307c6bb18f66669a36c

Merge "Handle missing static for CREATOR"

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 788ab74..d69fef0 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -2087,6 +2087,10 @@
                                         + "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 "