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

Commit 986b40ea authored by Craig Lafayette's avatar Craig Lafayette Committed by Android Git Automerger
Browse files

am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts... 

am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev

* commit '7df8b265':
  Prevent null allowableAccounts from crashing
parents 230d8243 7df8b265

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,