From c78e5d71523dc3eef17404bd0bd62f23fc37e2dd Mon Sep 17 00:00:00 2001 From: Adam He Date: Thu, 28 Feb 2019 12:55:26 -0800 Subject: Added NPE check on verifySameType(). Fixes: 120240686 Test: atest CtsAutoFillServiceTestCases Change-Id: Ic7fe6e04d67e661e18a4c0e970bbaf5c22f74815 --- core/java/android/content/pm/BaseParceledListSlice.java | 4 ++-- 1 file 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 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())); } } -- cgit v1.2.3-59-g8ed1b