diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvInputInfo.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index cecb83a..3d17216 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16555,7 +16555,7 @@ package android.media.tv { method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager); method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); - field public static final java.lang.String EXTRA_SERVICE_NAME = "serviceName"; + field public static final java.lang.String EXTRA_INPUT_ID = "inputId"; field public static final int TYPE_HDMI = 1; // 0x1 field public static final int TYPE_PASSTHROUGH = 3; // 0x3 field public static final int TYPE_TUNER = 2; // 0x2 diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 5624f3e..3dc9ffb 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -68,9 +68,9 @@ public final class TvInputInfo implements Parcelable { public static final int TYPE_PASSTHROUGH = 3; /** - * The name of the TV input service to provide to the setup activity and settings activity. + * The ID of the TV input to provide to the setup activity and settings activity. */ - public static final String EXTRA_SERVICE_NAME = "serviceName"; + public static final String EXTRA_INPUT_ID = "inputId"; private static final String XML_START_TAG_NAME = "tv-input"; @@ -190,7 +190,7 @@ public final class TvInputInfo implements Parcelable { if (!TextUtils.isEmpty(mSetupActivity)) { Intent intent = new Intent(Intent.ACTION_MAIN); intent.setClassName(mService.serviceInfo.packageName, mSetupActivity); - intent.putExtra(EXTRA_SERVICE_NAME, mService.serviceInfo.name); + intent.putExtra(EXTRA_INPUT_ID, getId()); return intent; } return null; @@ -203,7 +203,7 @@ public final class TvInputInfo implements Parcelable { if (!TextUtils.isEmpty(mSettingsActivity)) { Intent intent = new Intent(Intent.ACTION_MAIN); intent.setClassName(mService.serviceInfo.packageName, mSettingsActivity); - intent.putExtra(EXTRA_SERVICE_NAME, mService.serviceInfo.name); + intent.putExtra(EXTRA_INPUT_ID, getId()); return intent; } return null; |