From 9f943bad9d4638db8e46f1e857e9bd3c9933f7de Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Mon, 3 Mar 2025 10:25:16 +0800
Subject: [PATCH] Validate SSID only on the Submit button

- Avoid to validate the SSID when scanning a QR code

Bug: 399791242
Flag: EXEMPT bugfix
Test: Manual testing
  atest SettingsUnitTests:AddNetworkFragmentTest
Change-Id: I91f010f8708490e397d762c96401569fc13601dd
---
 src/com/android/settings/wifi/AddNetworkFragment.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
index 38bc0b592c4..aa8e840e38d 100644
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -206,6 +206,9 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
 
     @VisibleForTesting
     void handleSubmitAction() {
+        if (!mUIController.canFinish()) {
+            return;
+        }
         successfullyFinish(mUIController.getConfig());
     }
 
@@ -234,9 +237,6 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
 
             activity.getSystemService(WifiManager.class).save(config, saveListener);
         } else {
-            if (!mUIController.canFinish()) {
-                return;
-            }
             Intent intent = new Intent();
             intent.putExtra(WIFI_CONFIG_KEY, config);
             activity.setResult(Activity.RESULT_OK, intent);