diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index e8a8f462048..ebbec5dd43f 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
accountHeaders = new ArrayList
(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();