commit beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0
author Brian Muramatsu <btmura@google.com> Thu Jun 28 16:53:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 28 16:53:47 2012 -0700
tree 829b909d514ac7f8db1887a985fe380fd359eb37
parent 3cc385b83ca0f2c5e7a6b8464604ec3eb613f235
parent c28af52e596230e53e910078a8474e19fea6ed57

Merge "Fix Settings NPE" into jb-dev

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e8a8f46..ebbec5dd 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -439,6 +439,10 @@
         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 @@
             mWifiEnabler.resume();
             mBluetoothEnabler.resume();
         }
-        
+
         public void pause() {
             mWifiEnabler.pause();
             mBluetoothEnabler.pause();