1 files changed, 8 insertions, 2 deletions
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java b/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java
index d084f1069..20a91c41a 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java
@@ -18,6 +18,7 @@ package com.android.tv.settings.connectivity.setup;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -120,13 +121,18 @@ public class EnterSsidState implements State {
         }
 
         @Override
-        public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+        public void onResume() {
+            super.onResume();
             openInEditMode(mAction);
         }
 
         @Override
         public long onGuidedActionEditedAndProceed(GuidedAction action) {
-            mUserChoiceInfo.put(UserChoiceInfo.SSID, action.getTitle().toString());
+            final String ssid = action.getTitle().toString();
+            if (TextUtils.isEmpty(ssid)) {
+                return GuidedAction.ACTION_ID_CURRENT;
+            }
+            mUserChoiceInfo.put(UserChoiceInfo.SSID, ssid);
             mStateMachine.getListener().onComplete(StateMachine.CONTINUE);
             return action.getId();
         }