am a1f57c79: Merge "Occlude syncs without provider info." into jb-dev

* commit 'a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61':
  Occlude syncs without provider info.
This commit is contained in:
Carlos Valdivia
2012-05-09 01:49:25 -07:00
committed by Android Git Automerger

View File

@@ -208,11 +208,13 @@ public class AccountSyncSettings extends AccountPreferenceBase {
new SyncStateCheckBoxPreference(getActivity(), account, authority);
item.setPersistent(false);
final ProviderInfo providerInfo = getPackageManager().resolveContentProvider(authority, 0);
CharSequence providerLabel = providerInfo != null
? providerInfo.loadLabel(getPackageManager()) : null;
if (providerInfo == null) {
return;
}
CharSequence providerLabel = providerInfo.loadLabel(getPackageManager());
if (TextUtils.isEmpty(providerLabel)) {
Log.e(TAG, "Provider needs a label for authority '" + authority + "'");
providerLabel = authority;
return;
}
String title = getString(R.string.sync_item_title, providerLabel);
item.setTitle(title);