Merge "Add null check for sync authorities of an account type" into lmp-dev (eac7cc5e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accounts/AccountSettings.java

+23 −14

Original line number	Diff line number	Diff line
		@@ -361,21 +361,10 @@ public class AccountSettings extends SettingsPreferenceFragment

		for (int i = 0; i < accountTypes.length; i++) {
		final String accountType = accountTypes[i];
		if (mAuthoritiesCount > 0) {
		// Skip showing any account that does not have any of the requested authorities
		final ArrayList<String> authoritiesForType = helper.getAuthoritiesForAccountType(
		accountType);
		boolean show = false;
		for (int j = 0; j < mAuthoritiesCount; j++) {
		if (authoritiesForType.contains(mAuthorities[j])) {
		show = true;
		break;
		}
		}
		if (!show) {
		if (!accountTypeHasAnyRequestedAuthorities(helper, accountType)) {
		continue;
		}
		}
		final CharSequence label = helper.getLabelForType(getActivity(), accountType);
		if (label == null) {
		continue;
		@@ -418,6 +407,26 @@ public class AccountSettings extends SettingsPreferenceFragment
		return accountTypePreferences;
		}

		private boolean accountTypeHasAnyRequestedAuthorities(AuthenticatorHelper helper,
		String accountType) {
		if (mAuthoritiesCount == 0) {
		// No authorities required
		return true;
		}
		final ArrayList<String> authoritiesForType = helper.getAuthoritiesForAccountType(
		accountType);
		if (authoritiesForType == null) {
		Log.d(TAG, "No sync authorities for account type: " + accountType);
		return false;
		}
		for (int j = 0; j < mAuthoritiesCount; j++) {
		if (authoritiesForType.contains(mAuthorities[j])) {
		return true;
		}
		}
		return false;
		}

		private class AccountPreference extends Preference implements OnPreferenceClickListener {
		/**
		* Title of the tile that is shown to the user.

src/com/android/settings/accounts/AuthenticatorHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -190,10 +190,10 @@ final public class AuthenticatorHelper extends BroadcastReceiver {
		mEnabledAccountTypes.add(account.type);
		}
		}
		buildAccountTypeToAuthoritiesMap();
		if (mListeningToAccountUpdates) {
		mListener.onAccountsUpdate(mUserHandle);
		}
		buildAccountTypeToAuthoritiesMap();
		}

		@Override