summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChulwoo Lee <chulwoo@google.com>2014-07-17 06:19:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-17 04:18:22 +0000
commit5130655bcbb9e5bc091b27397558543201471263 (patch)
treefa5c22baacde6e9240488b3f76b9ff7e28a1e1e6 /media
parent3b2f507910139d7f6dcfea89684196145431859e (diff)
parent029179d7f975b498e79308aac0e478e91900a0cb (diff)
downloadframeworks_base-5130655bcbb9e5bc091b27397558543201471263.zip
frameworks_base-5130655bcbb9e5bc091b27397558543201471263.tar.gz
frameworks_base-5130655bcbb9e5bc091b27397558543201471263.tar.bz2
Merge "Pass input ID to the setup/settings activity" into lmp-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/tv/TvInputInfo.java8
1 files changed, 4 insertions, 4 deletions
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;