diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-24 07:40:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-24 07:40:37 +0000 |
commit | 45432304255d182d46812249377e01d0b50f3343 (patch) | |
tree | 8e2d8c35d43a3b6c6ea882562322c1861032fcc8 | |
parent | 4b626d64eb031769d64cc4b93f0fdbd3b84ea27d (diff) | |
parent | 52c27b15e350ce7cbd490a8ff1401ce0ae3baf30 (diff) | |
download | TvSettings-45432304255d182d46812249377e01d0b50f3343.tar.gz |
release-request-2950741e-0b24-4d70-b748-67bb2b5435b5-for-git_oc-mr1-release-4357583 snap-temp-L55500000105655441
Change-Id: Ia9b4ec5a9922fc8a1183efa930be118f599e3d62
-rw-r--r-- | Settings/src/com/android/tv/settings/MainFragment.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java index 9d61b62ec..a48a73409 100644 --- a/Settings/src/com/android/tv/settings/MainFragment.java +++ b/Settings/src/com/android/tv/settings/MainFragment.java @@ -445,16 +445,11 @@ public class MainFragment extends LeanbackPreferenceFragment { final ResolveInfo info = systemIntentIsHandled(getContext(), googleSettingsPref.getIntent()); googleSettingsPref.setVisible(info != null); - if (info != null) { - try { - final Context targetContext = getContext() - .createPackageContext(info.resolvePackageName != null ? - info.resolvePackageName : info.activityInfo.packageName, 0); - googleSettingsPref.setIcon(targetContext.getDrawable(info.iconResourceId)); - } catch (Resources.NotFoundException | PackageManager.NameNotFoundException - | SecurityException e) { - Log.e(TAG, "Google settings icon not found", e); - } + if (info != null && info.activityInfo != null) { + googleSettingsPref.setIcon( + info.activityInfo.loadIcon(getContext().getPackageManager())); + googleSettingsPref.setTitle( + info.activityInfo.loadLabel(getContext().getPackageManager())); } final Preference speechPref = findPreference(KEY_SPEECH_SETTINGS); |