From 75ffc5f309cd7a31c4bf096bea21293dfa44b60e Mon Sep 17 00:00:00 2001 From: Chulwoo Lee Date: Mon, 1 May 2017 14:10:25 -0700 Subject: 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 --- media/java/android/media/tv/TvInputInfo.java | 3 --- 1 file changed, 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); -- cgit v1.2.3-59-g8ed1b