Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '986b40ea99d6fdbb836a52fe6a6991fbb1eeca01':
  Prevent null allowableAccounts from crashing
This commit is contained in:
Craig Lafayette
2015-07-14 18:21:51 +00:00
committed by Android Git Automerger
parent cd843caa37 986b40ea99
commit a2113804f9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/accounts/AccountManager.java
View File

@@ -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,