commit ef846dbe99d3dd111641d3d78e5e470543d2f575
author Dongwon Kang <dwkang@google.com> Fri Oct 24 02:06:07 2014 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 24 02:06:07 2014 +0000
tree e1c46512a1f64cb7c15299f31e6e4303e0b53566
parent eed63916a184b05fa8572c9a8151745d05777740
parent 08fe9fbf56e8954ee4817c7ae69b1e6b059a864f

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

* commit '08fe9fbf56e8954ee4817c7ae69b1e6b059a864f':
  TIF: exclude tuner TV input not having a setup activity in the input list.

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) {