From fddf07d3be62c8817b82a1e6c7168210fe1ab46a Mon Sep 17 00:00:00 2001 From: Youngsang Cho Date: Thu, 17 Jul 2014 16:24:12 -0700 Subject: Use Context for TvInputInfo.loadLabel/Icon instead of PackageManager Bug: 16166859 Change-Id: I16c996ad54e3089dc8bdeaa63f26d1f729dcc5b4 --- src/com/android/tv/ui/ChannelBannerView.java | 2 +- src/com/android/tv/util/Utils.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/tv/ui/ChannelBannerView.java b/src/com/android/tv/ui/ChannelBannerView.java index a03d4385..255468c5 100644 --- a/src/com/android/tv/ui/ChannelBannerView.java +++ b/src/com/android/tv/ui/ChannelBannerView.java @@ -67,7 +67,7 @@ public class ChannelBannerView extends RelativeLayout implements Channel.LoadLog new LruCache (CACHE_SIZE) { @Override protected Drawable create(TvInputInfo info) { - return info.loadIcon(getContext().getPackageManager()); + return info.loadIcon(getContext()); } }; diff --git a/src/com/android/tv/util/Utils.java b/src/com/android/tv/util/Utils.java index 91df70de..b5c7e375 100644 --- a/src/com/android/tv/util/Utils.java +++ b/src/com/android/tv/util/Utils.java @@ -278,9 +278,8 @@ public class Utils { public static String getDisplayNameForInput(Context context, TvInputInfo info) { SharedPreferences preferences = getSharedPreferencesOfDisplayNameForInput(context); - PackageManager pm = context.getPackageManager(); return preferences.getString(TvSettings.PREF_DISPLAY_INPUT_NAME + info.getId(), - info.loadLabel(pm).toString()); + info.loadLabel(context).toString()); } public static boolean hasActivity(Context context, TvInputInfo input, String action) { -- cgit v1.2.3