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

Commit 6af43e5d authored by Chulwoo Lee's avatar Chulwoo Lee Committed by android-build-merger
Browse files

Merge "Allow null setup activity for TV input" into oc-dev 

am: 90074d1e

Change-Id: I18545582572c60956548af8c732b7e6543f00d76
parents 783019d2 90074d1e

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

+0 −3
Original line number Diff line number Diff line
@@ -949,9 +949,6 @@ public final class TvInputInfo implements Parcelable { 
                        com.android.internal.R.styleable.TvInputService);

                mSetupActivity = sa.getString(

                        com.android.internal.R.styleable.TvInputService_setupActivity);

                if (inputType == TYPE_TUNER && TextUtils.isEmpty(mSetupActivity)) {

                    throw new IllegalStateException("Setup activity not found for " + si.name);

                }

                if (mCanRecord == null) {

                    mCanRecord = sa.getBoolean(

                            com.android.internal.R.styleable.TvInputService_canRecord, false);