Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c16816 authored by Quang Luong's avatar Quang Luong
Browse files

Remove WifiEntry transitional security types 

WifiEntry should only supply one security type through getSecurity(),
and transitional types should be converted to the security type that
will be used for connection.

Test: build
Bug: 70983952
Change-Id: I977f6b955b7794124e9b90ad4655cd2a2a30cb6e
parent 4d0fa39b

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

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ public class WifiConfigController2 implements TextWatcher, 
                mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK

                        ? View.GONE

                        : View.VISIBLE);

        mSecurityInPosition = new Integer[WifiEntry.SECURITY_MAX_VAL];

        mSecurityInPosition = new Integer[WifiEntry.NUM_SECURITY_TYPES];



        if (mWifiEntry == null) { // new network

            configureSecuritySpinner();

src/com/android/settings/wifi/dpp/WifiDppUtils.java

+0 −5
Original line number Diff line number Diff line
@@ -252,11 +252,6 @@ public class WifiDppUtils { 
        final WifiConfiguration wifiConfiguration = wifiEntry.getWifiConfiguration();

        setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);



        // For a transition mode Wi-Fi AP, creates a QR code that's compatible with more devices

        if (wifiEntry.getSecurity() == WifiEntry.SECURITY_PSK_SAE_TRANSITION) {

            intent.putExtra(EXTRA_WIFI_SECURITY, WifiQrCode.SECURITY_WPA_PSK);

        }



        return intent;

    }