diff options
| -rw-r--r-- | core/java/android/content/pm/BaseParceledListSlice.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/pm/BaseParceledListSlice.java b/core/java/android/content/pm/BaseParceledListSlice.java index a3e5d6d43588..4178309450bd 100644 --- a/core/java/android/content/pm/BaseParceledListSlice.java +++ b/core/java/android/content/pm/BaseParceledListSlice.java @@ -128,8 +128,8 @@ abstract class BaseParceledListSlice<T> implements Parcelable { private static void verifySameType(final Class<?> expected, final Class<?> actual) { if (!actual.equals(expected)) { throw new IllegalArgumentException("Can't unparcel type " - + actual.getName() + " in list of type " - + expected.getName()); + + (actual == null ? null : actual.getName()) + " in list of type " + + (expected == null ? null : expected.getName())); } } |