commit f9f7acf2388e27250c94daf2e29e55a39fd95a84
author Dongwon Kang <dwkang@google.com> Fri Oct 24 01:24:04 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 24 01:24:05 2014 +0000
tree 85384bb1afdde8dcd6cdb7d1424b687ac6b0de7a
parent bd6fabe2ae535cf5d31fc7a1952e43ad6e653e2e
parent 5168a7a0d34fc4151b15587c66663451c17434bc

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

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 54ebc6a..b9e99d2 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -241,6 +241,9 @@
             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) {