From 13ade46b5320f3c1982e8e9bc39508bb7fc647db Mon Sep 17 00:00:00 2001 From: Carlos Valdivia Date: Tue, 8 May 2012 16:39:15 -0700 Subject: [PATCH] Occlude syncs without provider info. Bug: 934147 Change-Id: Ib3413efda07432cfc52cb5b1a20350ed5c7655a8 --- .../android/settings/accounts/AccountSyncSettings.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 82f984486f1..4d9f80e4211 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -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);