From 5168a7a0d34fc4151b15587c66663451c17434bc Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Thu, 23 Oct 2014 17:56:31 +0900 Subject: [PATCH] TIF: exclude tuner TV input not having a setup activity in the input list. By doing this, developers can notice the flaw of the input in advance. Bug: 17647146 Change-Id: I123a5538566959320a6201a4d7952e205602a28a --- media/java/android/media/tv/TvInputInfo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 54ebc6aad10c0..b9e99d2c14a40 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -241,6 +241,9 @@ public final class TvInputInfo implements Parcelable { if (DEBUG) { 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( com.android.internal.R.styleable.TvInputService_settingsActivity); if (DEBUG) {