PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Settings NPE" into jb-dev

Browse Source
This commit is contained in:
Brian Muramatsu
2012-06-28 16:53:47 -07:00
committed by Android (Google) Code Review
parent 3cc385b83c c28af52e59
commit beb3d8b1e0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/Settings.java
View File

@@ -439,6 +439,10 @@ public class Settings extends PreferenceActivity
List<Header> accountHeaders = new ArrayList<Header>(accountTypes.length); List<Header> accountHeaders = new ArrayList<Header>(accountTypes.length);
for (String accountType : accountTypes) { for (String accountType : accountTypes) {
CharSequence label = mAuthenticatorHelper.getLabelForType(this, accountType); CharSequence label = mAuthenticatorHelper.getLabelForType(this, accountType);
if (label == null) {
continue;
}
Account[] accounts = AccountManager.get(this).getAccountsByType(accountType); Account[] accounts = AccountManager.get(this).getAccountsByType(accountType);
boolean skipToAccount = accounts.length == 1 boolean skipToAccount = accounts.length == 1
&& !mAuthenticatorHelper.hasAccountPreferences(accountType); && !mAuthenticatorHelper.hasAccountPreferences(accountType);
@@ -689,7 +693,7 @@ public class Settings extends PreferenceActivity
mWifiEnabler.resume(); mWifiEnabler.resume();
mBluetoothEnabler.resume(); mBluetoothEnabler.resume();
} }
public void pause() { public void pause() {
mWifiEnabler.pause(); mWifiEnabler.pause();
mBluetoothEnabler.pause(); mBluetoothEnabler.pause();