commit 3c9c71d36e9eb6c88065fe064a15881e62c29268
author Craig Lafayette <craiglafa@google.com> Tue Jul 14 10:48:46 2015 -0400
committer Craig Lafayette <craiglafa@google.com> Tue Jul 14 11:09:58 2015 -0400
tree 412af243dd0173a920bfcfd3257b827c944e1e10
parent 8af7432ca3fc1ce3539997d24439954f0e64134c

Prevent null allowableAccounts from crashing

The javadoc for newChooseAccountIntent says that a null
value for the allowableAccounts parameter is valid and
an acceptable default. This CL makes sure that when this
parameter is null, a NullPointerException is not thrown.

Bug: 22475546
Change-Id: Ieb0d67dd02628e1ae5629499b3be3c6382efc9aa

core/java/android/accounts/AccountManager.java

diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index 7a20929..dd3d3a8 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -2359,7 +2359,7 @@
         intent.setClassName(componentName.getPackageName(),
                 componentName.getClassName());
         intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNTS_ARRAYLIST,
-                new ArrayList<Account>(allowableAccounts));
+                allowableAccounts == null ? null : new ArrayList<Account>(allowableAccounts));
         intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY,
                 allowableAccountTypes);
         intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE,