commit 6af43e5d6fe1cfedc182094e46d2828fd121d044
author Chulwoo Lee <chulwoo@google.com> Tue May 02 07:02:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 02 07:02:35 2017 +0000
tree 14d3c17924ad2f5ecea0d81fcfae086328126f08
parent 783019d2ff2ee87462934bad21a80fcfb99b60a7
parent 90074d1ec8837daef0044137eca8822e4dbc262f

Merge "Allow null setup activity for TV input" into oc-dev
am: 90074d1ec8

Change-Id: I18545582572c60956548af8c732b7e6543f00d76

media/java/android/media/tv/TvInputInfo.java

diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index a292b8e..74085d3 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -949,9 +949,6 @@
                         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);