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

Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev automerge: f9f7acf

Browse Source 
automerge: 08fe9fb

* commit '08fe9fbf56e8954ee4817c7ae69b1e6b059a864f':
  TIF: exclude tuner TV input not having a setup activity in the input list.
This commit is contained in:
Dongwon Kang
2014-10-24 02:06:07 +00:00
committed by android-build-merger
parent eed63916a1 08fe9fbf56
commit ef846dbe99
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/tv/TvInputInfo.java
View File

@@ -241,6 +241,9 @@ public final class TvInputInfo implements Parcelable {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Setup activity loaded. [" + input.mSetupActivity + "] for " + si.name); Log.d(TAG, "Setup activity loaded. [" + input.mSetupActivity + "] for " + si.name);
} }
if (inputType == TYPE_TUNER && TextUtils.isEmpty(input.mSetupActivity)) {
throw new XmlPullParserException("Setup activity not found in " + si.name);
}
input.mSettingsActivity = sa.getString( input.mSettingsActivity = sa.getString(
com.android.internal.R.styleable.TvInputService_settingsActivity); com.android.internal.R.styleable.TvInputService_settingsActivity);
if (DEBUG) { if (DEBUG) {