From 029179d7f975b498e79308aac0e478e91900a0cb Mon Sep 17 00:00:00 2001 From: Chulwoo Lee Date: Wed, 16 Jul 2014 14:31:33 +0900 Subject: Pass input ID to the setup/settings activity In the setup/setting phase, the activities should know their input ID to access the channels/programs table. Change-Id: If7afcb0ea474dca08c3dee06cbfcf76191a68660 --- media/java/android/media/tv/TvInputInfo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'media') 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; -- cgit v1.1