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

Commit 21279045 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "WifiConfiguration: Add a method to check if keymgmt needs preShareKey"... 

Merge "WifiConfiguration: Add a method to check if keymgmt needs preShareKey" into rvc-dev am: 507bbaeb am: fab090f3 am: 4edb4cd4 am: a9222c96

Change-Id: Iabf49931a49ab27786ca5b2187c1fda9de69b4cb
parents dd699cc3 a9222c96

wifi/java/android/net/wifi/WifiConfiguration.java

+11 −0
Original line number Diff line number Diff line
@@ -2973,4 +2973,15 @@ public class WifiConfiguration implements Parcelable { 
     */

    public boolean isMostRecentlyConnected = false;



    /**

     * Whether the key mgmt indicates if the WifiConfiguration needs a preSharedKey or not.

     * @return true if preSharedKey is needed, false otherwise.

     * @hide

     */

    public boolean needsPreSharedKey() {

        return allowedKeyManagement.get(KeyMgmt.WPA_PSK)

                || allowedKeyManagement.get(KeyMgmt.SAE)

                || allowedKeyManagement.get(KeyMgmt.WAPI_PSK);

    }



}

wifi/tests/src/android/net/wifi/WifiConfigurationTest.java

+30 −0
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


package android.net.wifi;



import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP;

import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B;

import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_OPEN;

import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_OWE;

import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_PSK;

import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_SAE;

import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_WAPI_PSK;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;
@@ -507,4 +511,30 @@ public class WifiConfigurationTest { 
        assertEquals(NetworkSelectionStatus.NETWORK_SELECTION_PERMANENTLY_DISABLED,

                status2.getNetworkSelectionStatus());

    }



    @Test

    public void testNeedsPreSharedKey() throws Exception {

        WifiConfiguration configuration = new WifiConfiguration();



        configuration.setSecurityParams(SECURITY_TYPE_PSK);

        assertTrue(configuration.needsPreSharedKey());



        configuration.setSecurityParams(SECURITY_TYPE_SAE);

        assertTrue(configuration.needsPreSharedKey());



        configuration.setSecurityParams(SECURITY_TYPE_WAPI_PSK);

        assertTrue(configuration.needsPreSharedKey());



        configuration.setSecurityParams(SECURITY_TYPE_OPEN);

        assertFalse(configuration.needsPreSharedKey());



        configuration.setSecurityParams(SECURITY_TYPE_OWE);

        assertFalse(configuration.needsPreSharedKey());



        configuration.setSecurityParams(SECURITY_TYPE_EAP);

        assertFalse(configuration.needsPreSharedKey());



        configuration.setSecurityParams(SECURITY_TYPE_EAP_SUITE_B);

        assertFalse(configuration.needsPreSharedKey());

    }

}