summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chulwoo Lee <chulwoo@google.com> 2017-05-01 14:10:25 -0700
committer Chulwoo Lee <chulwoo@google.com> 2017-05-01 14:10:25 -0700
commit75ffc5f309cd7a31c4bf096bea21293dfa44b60e (patch)
tree10f7702c5a9e94d591c6cbeda24aeac1479c2165
parentda3dd7c0cf1fcd7e352c8f9e30519e85776c5662 (diff)
Allow null setup activity for TV input
Test: cts-tradefed run cts -m CtsTvTestCases -t android.media.tv.cts.TvInputInfoTest Bug: 37863603 Change-Id: I62f9927f94534c0564a3c52f8c7b266a347399e1
-rw-r--r--media/java/android/media/tv/TvInputInfo.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index a292b8e4f81e..74085d39162c 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -949,9 +949,6 @@ public final class TvInputInfo implements Parcelable {
com.android.internal.R.styleable.TvInputService);
mSetupActivity = sa.getString(
com.android.internal.R.styleable.TvInputService_setupActivity);
- if (inputType == TYPE_TUNER && TextUtils.isEmpty(mSetupActivity)) {
- throw new IllegalStateException("Setup activity not found for " + si.name);
- }
if (mCanRecord == null) {
mCanRecord = sa.getBoolean(
com.android.internal.R.styleable.TvInputService_canRecord, false);