Merge "Handle missing static for CREATOR"

2013-01-11 18:27:59 -08:00
parent 5ae8e45ff3 97a72f6693
commit 369da18ffb
1 changed files with 4 additions and 0 deletions
--- 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 "