OSDN Git Service

Allow null setup activity for TV input
authorChulwoo Lee <chulwoo@google.com>
Mon, 1 May 2017 21:10:25 +0000 (14:10 -0700)
committerChulwoo Lee <chulwoo@google.com>
Mon, 1 May 2017 21:10:25 +0000 (14:10 -0700)
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

index a292b8e..74085d3 100644 (file)
@@ -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);