summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/AddAccountSettings.java2
-rw-r--r--src/com/android/settings/ManageAccountsSettings.java2
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)) {