From cfc17f22cf504386c865d310be565d98105b3774 Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Tue, 1 Dec 2009 16:30:44 -0800 Subject: keep the account settings from crashing when there are no sync adapters for an account --- src/com/android/settings/AddAccountSettings.java | 2 +- 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 564f4c7..f87ef7c 100644 --- a/src/com/android/settings/AddAccountSettings.java +++ b/src/com/android/settings/AddAccountSettings.java @@ -70,7 +70,7 @@ public class AddAccountSettings extends AccountPreferenceBase { // then include them all. ArrayList 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 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)) { -- cgit v1.2.3