Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c9c71d3 authored by Craig Lafayette's avatar Craig Lafayette
Browse files

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
parent 8af7432c

core/java/android/accounts/AccountManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2359,7 +2359,7 @@ public class AccountManager { 
        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,