summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt4
-rw-r--r--media/java/android/media/tv/TvInputInfo.java12
2 files changed, 8 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt
index 8076d47d5b66..8661d5e4f373 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16491,8 +16491,8 @@ package android.media.tv {
method public android.content.Intent getIntentForSetupActivity();
method public android.content.pm.ServiceInfo getServiceInfo();
method public int getType();
- method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
- method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
+ method public java.lang.CharSequence loadLabel(android.content.Context);
method public void writeToParcel(android.os.Parcel, int);
field public static final java.lang.String EXTRA_SERVICE_NAME = "serviceName";
field public static final int TYPE_HDMI = 1; // 0x1
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index 5624f3ec0bbb..08dd0492d1ce 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -219,24 +219,24 @@ public final class TvInputInfo implements Parcelable {
/**
* Loads the user-displayed label for this TV input service.
*
- * @param pm Supplies a PackageManager used to load the TV input's resources.
+ * @param context Supplies a {@link Context} used to load the label.
* @return a CharSequence containing the TV input's label. If the TV input does not have
* a label, its name is returned.
*/
- public CharSequence loadLabel(PackageManager pm) {
- return mService.loadLabel(pm);
+ public CharSequence loadLabel(Context context) {
+ return mService.loadLabel(context.getPackageManager());
}
/**
* Loads the user-displayed icon for this TV input service.
*
- * @param pm Supplies a PackageManager used to load the TV input's resources.
+ * @param context Supplies a {@link Context} used to load the icon.
* @return a Drawable containing the TV input's icon. If the TV input does not have
* an icon, application icon is returned. If it's unavailable too, system default is
* returned.
*/
- public Drawable loadIcon(PackageManager pm) {
- return mService.serviceInfo.loadIcon(pm);
+ public Drawable loadIcon(Context context) {
+ return mService.serviceInfo.loadIcon(context.getPackageManager());
}
@Override