diff options
| author | Fred Quintana <fredq@google.com> | 2009-12-02 10:01:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 10:01:30 -0800 |
| commit | ece69cf9094019b1b1db85b277e735085da4492a (patch) | |
| tree | a37f61869bf51013a7b91e41cfde1f3e9a4e9e58 | |
| parent | 5247451d5a91dd1e29f7cf7e9dbdb06f9b814511 (diff) | |
| parent | 5751b50bfe739fa8e9bf8bf9cce412dc891eabaf (diff) | |
| download | AccountsAndSyncSettings-ece69cf9094019b1b1db85b277e735085da4492a.tar.gz | |
am 5751b50b: am cfc17f22: keep the account settings from crashing when there are no sync adapters for an account
Merge commit '5751b50bfe739fa8e9bf8bf9cce412dc891eabaf' into eclair-mr2-plus-aosp
* commit '5751b50bfe739fa8e9bf8bf9cce412dc891eabaf':
keep the account settings from crashing when there are no sync adapters for an account
| -rw-r--r-- | src/com/android/settings/AddAccountSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/ManageAccountsSettings.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/AddAccountSettings.java b/src/com/android/settings/AddAccountSettings.java index 74e3c24..6880e4a 100644 --- a/src/com/android/settings/AddAccountSettings.java +++ b/src/com/android/settings/AddAccountSettings.java @@ -71,7 +71,7 @@ public class AddAccountSettings extends AccountPreferenceBase { // then include them all. ArrayList<String> accountAuths = getAuthoritiesForAccountType(accountType); boolean addAccountPref = true; - if (mAuthorities != null && mAuthorities.length > 0) { + if (mAuthorities != null && mAuthorities.length > 0 && accountAuths != null) { addAccountPref = false; for (int k = 0; k < mAuthorities.length; k++) { if (accountAuths.contains(mAuthorities[k])) { diff --git a/src/com/android/settings/ManageAccountsSettings.java b/src/com/android/settings/ManageAccountsSettings.java index 7b672f1..b1f1077 100644 --- a/src/com/android/settings/ManageAccountsSettings.java +++ b/src/com/android/settings/ManageAccountsSettings.java @@ -225,7 +225,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase implements Vie final ArrayList<String> auths = getAuthoritiesForAccountType(account.type); boolean showAccount = true; - if (mAuthorities != null) { + if (mAuthorities != null && auths != null) { showAccount = false; for (String requestedAuthority : mAuthorities) { if (auths.contains(requestedAuthority)) { |