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

Commit 90074d1e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5555b1e3 75ffc5f3

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