PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Checks WEP password lengths of Wi-Fi network"

Browse Source 
This reverts commit 1cd3b6f21f.

Reason for revert:
http://b/338298452 Can't connect to WEP network because incorrect passphrase length check  

Change-Id: I4e152a0c89e9ee11b4faa957061b6e9844b1a0c4
This commit is contained in:
Weng Su
2024-05-09 06:49:41 +00:00
committed by Android (Google) Code Review
parent 1cd3b6f21f
commit 2e25a60436
2 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -514,12 +514,6 @@ public class WifiConfigController2 implements TextWatcher,
submit.setEnabled(isSubmittable()); 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) { boolean isValidPsk(String password) {
if (password.length() == 64 && password.matches("[0-9A-Fa-f]{64}")) { if (password.length() == 64 && password.matches("[0-9A-Fa-f]{64}")) {
return true; return true;
@@ -541,7 +535,7 @@ public class WifiConfigController2 implements TextWatcher,
boolean passwordInvalid = false; boolean passwordInvalid = false;
if (mPasswordView != null if (mPasswordView != null
&& ((mWifiEntrySecurity == WifiEntry.SECURITY_WEP && ((mWifiEntrySecurity == WifiEntry.SECURITY_WEP
&& !isValidWepPassword(mPasswordView.getText().toString())) && mPasswordView.length() == 0)
|| (mWifiEntrySecurity == WifiEntry.SECURITY_PSK || (mWifiEntrySecurity == WifiEntry.SECURITY_PSK
&& !isValidPsk(mPasswordView.getText().toString())) && !isValidPsk(mPasswordView.getText().toString()))
|| (mWifiEntrySecurity == WifiEntry.SECURITY_SAE || (mWifiEntrySecurity == WifiEntry.SECURITY_SAE

33
tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
View File

@@ -202,39 +202,6 @@ public class WifiConfigController2Test {
assertThat(mController.isSubmittable()).isFalse(); assertThat(mController.isSubmittable()).isFalse();
} }
@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 @Test
public void isSubmittable_longPsk_shouldReturnFalse() { public void isSubmittable_longPsk_shouldReturnFalse() {
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false); createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);