summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/settings/Settings.java')
-rw-r--r--src/com/android/settings/Settings.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e8a8f46..ebbec5d 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -439,6 +439,10 @@ public class Settings extends PreferenceActivity
List<Header> accountHeaders = new ArrayList<Header>(accountTypes.length);
for (String accountType : accountTypes) {
CharSequence label = mAuthenticatorHelper.getLabelForType(this, accountType);
+ if (label == null) {
+ continue;
+ }
+
Account[] accounts = AccountManager.get(this).getAccountsByType(accountType);
boolean skipToAccount = accounts.length == 1
&& !mAuthenticatorHelper.hasAccountPreferences(accountType);
@@ -689,7 +693,7 @@ public class Settings extends PreferenceActivity
mWifiEnabler.resume();
mBluetoothEnabler.resume();
}
-
+
public void pause() {
mWifiEnabler.pause();
mBluetoothEnabler.pause();