diff options
| author | Carlos Valdivia <carlosvaldivia@google.com> | 2012-05-08 17:28:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 17:28:44 -0700 |
| commit | a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61 (patch) | |
| tree | 91a42b17dfcefc8b17d4f01376df5ca57579e439 /src/com | |
| parent | db5584158180bbb5af9a07f0c5f505388807f13c (diff) | |
| parent | 13ade46b5320f3c1982e8e9bc39508bb7fc647db (diff) | |
| download | packages_apps_settings-a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61.zip packages_apps_settings-a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61.tar.gz packages_apps_settings-a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61.tar.bz2 | |
Merge "Occlude syncs without provider info." into jb-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/accounts/AccountSyncSettings.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 82f9844..4d9f80e 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); |