Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef846dbe authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "TIF: exclude tuner TV input not having a setup activity in the input... 

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

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

media/java/android/media/tv/TvInputInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -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) {