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

Add minimum TLS version for Wi-Fi EAP network

Browse Source 
- Remove "TLS v1.3" if device does not support it

Bug: 258372351
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test

Change-Id: If7e41e8c404b4fbf92268afddd92bc6553e60576
This commit is contained in:
Weng Su
2022-11-09 14:57:07 +08:00
parent fb8200aef8
commit c5ec83f1bd
5 changed files with 88 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,11 +73,16 @@ import org.robolectric.shadows.ShadowInputMethodManager;
import org.robolectric.shadows.ShadowSubscriptionManager;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
public class WifiConfigController2Test {
static final String WIFI_EAP_TLS_V1_3 = "TLS v1.3";
@Mock
private WifiConfigUiBase2 mConfigUiBase;
@Mock
@@ -938,6 +943,26 @@ public class WifiConfigController2Test {
assertThat(mEapUserCertSpinner.getSelectedItem()).isEqualTo(SAVED_USER_CERT);
}
@Test
public void getEapMinTlsVerSpinner_isTlsV13Supported_containsTlsV13() {
Spinner spinner = mController.getEapMinTlsVerSpinner(true /* isTlsV13Supported */);
List<Object> list = IntStream.range(0, spinner.getAdapter().getCount())
.mapToObj(spinner.getAdapter()::getItem)
.collect(Collectors.toList());
assertThat(list).contains(WIFI_EAP_TLS_V1_3);
}
@Test
public void getEapMinTlsVerSpinner_isNotTlsV13Supported_doesNotContainTlsV13() {
Spinner spinner = mController.getEapMinTlsVerSpinner(false /* isTlsV13Supported */);
List<Object> list = IntStream.range(0, spinner.getAdapter().getCount())
.mapToObj(spinner.getAdapter()::getItem)
.collect(Collectors.toList());
assertThat(list).doesNotContain(WIFI_EAP_TLS_V1_3);
}
private void setUpModifyingSavedCertificateConfigController(String savedCaCertificate,
String savedUserCertificate) {
final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);