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

Commit 34575671 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 

am: 6af43e5d

Change-Id: I0b791a12cdee5dc5ce4bdc1c27eecd8b0166fc15
parents 82bde6ec 6af43e5d

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

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

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

                mSetupActivity = sa.getString(

                mSetupActivity = sa.getString(

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

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

                if (mCanRecord == null) {

                    mCanRecord = sa.getBoolean(

                    mCanRecord = sa.getBoolean(

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

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