diff options
| -rw-r--r-- | core/java/android/service/autofill/AutofillServiceHelper.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/service/autofill/AutofillServiceHelper.java b/core/java/android/service/autofill/AutofillServiceHelper.java index bbaebff439fb..13fedba1dde7 100644 --- a/core/java/android/service/autofill/AutofillServiceHelper.java +++ b/core/java/android/service/autofill/AutofillServiceHelper.java @@ -26,7 +26,13 @@ final class AutofillServiceHelper { static AutofillId[] assertValid(@Nullable AutofillId[] ids) { Preconditions.checkArgument(ids != null && ids.length > 0, "must have at least one id"); - return Preconditions.checkArrayElementsNotNull(ids, "ids"); + // Can't use Preconditions.checkArrayElementsNotNull() because it throws NPE instead of IAE + for (int i = 0; i < ids.length; ++i) { + if (ids[i] == null) { + throw new IllegalArgumentException("ids[" + i + "] must not be null"); + } + } + return ids; } private AutofillServiceHelper() { |