diff options
| author | 2017-05-02 07:02:35 +0000 | |
|---|---|---|
| committer | 2017-05-02 07:02:35 +0000 | |
| commit | 6af43e5d6fe1cfedc182094e46d2828fd121d044 (patch) | |
| tree | 14d3c17924ad2f5ecea0d81fcfae086328126f08 | |
| parent | 783019d2ff2ee87462934bad21a80fcfb99b60a7 (diff) | |
| parent | 90074d1ec8837daef0044137eca8822e4dbc262f (diff) | |
Merge "Allow null setup activity for TV input" into oc-dev
am: 90074d1ec8
Change-Id: I18545582572c60956548af8c732b7e6543f00d76
| -rw-r--r-- | media/java/android/media/tv/TvInputInfo.java | 3 |
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); |