Merge cherrypicks of [2938796, 2938330, 2938331, 2938853, 2938854, 2938005, 2938834] into oc-r2-releaseandroid-8.0.0_r29oreo-r2-release

Change-Id: I5859adc1a1084ac6d40519e12826fb0dd1ad65e3

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);