Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow null setup activity for TV input" into oc-dev

Browse Source 
am: 90074d1ec8

Change-Id: I18545582572c60956548af8c732b7e6543f00d76
This commit is contained in:
Chulwoo Lee
2017-05-02 07:02:35 +00:00
committed by android-build-merger
parent 783019d2ff 90074d1ec8
commit 6af43e5d6f
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/tv/TvInputInfo.java
View 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);