commit 8e4223c7699b31b5b49feb632b0e965e996f9acb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 09 08:00:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 08:00:14 2024 +0000
tree 3d9d3f71dfe607721120e0c011cf1254d522213a
parent ce57ffdbc2bf49f19b0d6e7ac4f5df4173aa182d
parent 2e25a60436bef9bfa5265c1845bca30fe033ca17

Merge "Revert "Checks WEP password lengths of Wi-Fi network"" into main

src/com/android/settings/wifi/WifiConfigController2.java

diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 1606469..1e40568 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -514,12 +514,6 @@
         submit.setEnabled(isSubmittable());
     }
 
-    boolean isValidWepPassword(String password) {
-        // Checks for WEP40 and WEP104 password lengths (5 and 13 bytes)
-        int passwordLen = (password != null) ? password.length() : -1;
-        return passwordLen == 5 || passwordLen == 13;
-    }
-
     boolean isValidPsk(String password) {
         if (password.length() == 64 && password.matches("[0-9A-Fa-f]{64}")) {
             return true;
@@ -541,7 +535,7 @@
         boolean passwordInvalid = false;
         if (mPasswordView != null
                 && ((mWifiEntrySecurity == WifiEntry.SECURITY_WEP
-                        && !isValidWepPassword(mPasswordView.getText().toString()))
+                        && mPasswordView.length() == 0)
                     || (mWifiEntrySecurity == WifiEntry.SECURITY_PSK
                            && !isValidPsk(mPasswordView.getText().toString()))
                     || (mWifiEntrySecurity == WifiEntry.SECURITY_SAE

tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java

diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index a531e3f..7d96496 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -203,39 +203,6 @@
     }
 
     @Test
-    public void isSubmittable_wepPasswordLength5_returnTrue() {
-        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
-        createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
-        final TextView password = mView.findViewById(R.id.password);
-        assertThat(password).isNotNull();
-        password.setText("12345");
-
-        assertThat(mController.isSubmittable()).isTrue();
-    }
-
-    @Test
-    public void isSubmittable_wepPasswordLength13_returnTrue() {
-        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
-        createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
-        final TextView password = mView.findViewById(R.id.password);
-        assertThat(password).isNotNull();
-        password.setText("1234567890123");
-
-        assertThat(mController.isSubmittable()).isTrue();
-    }
-
-    @Test
-    public void isSubmittable_wepPasswordLength1_returnFalse() {
-        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
-        createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
-        final TextView password = mView.findViewById(R.id.password);
-        assertThat(password).isNotNull();
-        password.setText("1");
-
-        assertThat(mController.isSubmittable()).isFalse();
-    }
-
-    @Test
     public void isSubmittable_longPsk_shouldReturnFalse() {
         createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
         final TextView password = mView.findViewById(R.id.password);