Check TV input when displaying EditChannelsDialog

BUG: 14857709
Change-Id: I31e44add4e46256241c7526ac728b470249cdc3a

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index 8eea6fcd..bd8089c2 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -382,14 +382,16 @@ public class TvActivity extends Activity implements
     }
 
     public void showEditChannelsDialog() {
-        EditChannelsDialogFragment f = new EditChannelsDialogFragment();
-        if (mTvInputInfo != null) {
-            Bundle arg = new Bundle();
-            arg.putParcelable(EditChannelsDialogFragment.ARG_CURRENT_INPUT, mTvInputInfo);
-            arg.putBoolean(EditChannelsDialogFragment.ARG_IS_UNIFIED_TV_INPUT, mIsUnifiedTvInput);
-            f.setArguments(arg);
+        if (mTvInputInfo == null) {
+            return;
         }
 
+        EditChannelsDialogFragment f = new EditChannelsDialogFragment();
+        Bundle arg = new Bundle();
+        arg.putParcelable(EditChannelsDialogFragment.ARG_CURRENT_INPUT, mTvInputInfo);
+        arg.putBoolean(EditChannelsDialogFragment.ARG_IS_UNIFIED_TV_INPUT, mIsUnifiedTvInput);
+        f.setArguments(arg);
+
         showDialogFragment(EditChannelsDialogFragment.DIALOG_TAG, f);
     }