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

Commit 60892133 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic "api-review-requirepmf" 

* changes:
  SettingsLib: Rename requirePMF to requirePmf
  Wifi: Rename requirePMF to requirePmf
parents f11642db c4e61a3a

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7598,7 +7598,7 @@ package android.net.wifi { 
    field @Deprecated public int numAssociation;

    field @Deprecated public int numScorerOverride;

    field @Deprecated public int numScorerOverrideAndSwitchedNetwork;

    field @Deprecated public boolean requirePMF;

    field @Deprecated public boolean requirePmf;

    field @Deprecated @Nullable public String saePasswordId;

    field @Deprecated public boolean shared;

    field @Deprecated public boolean useExternalScores;

api/system-lint-baseline.txt

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ MutableBareField: android.net.wifi.WifiConfiguration#macRandomizationSetting: 
    

MutableBareField: android.net.wifi.WifiConfiguration#meteredOverride:

    

MutableBareField: android.net.wifi.WifiConfiguration#requirePMF:

MutableBareField: android.net.wifi.WifiConfiguration#requirePmf:

    

MutableBareField: android.net.wifi.WifiConfiguration#saePasswordId:

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
            mConfig.allowedKeyManagement.set(KeyMgmt.NONE);

        } else {

            mConfig.allowedKeyManagement.set(KeyMgmt.OWE);

            mConfig.requirePMF = true;

            mConfig.requirePmf = true;

        }

    }

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

+8 −8
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ public class WifiConfiguration implements Parcelable { 
                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SAE);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);

                requirePMF = true;

                requirePmf = true;

                break;

            case SECURITY_TYPE_EAP_SUITE_B:

                allowedProtocols.set(WifiConfiguration.Protocol.RSN);
@@ -496,14 +496,14 @@ public class WifiConfiguration implements Parcelable { 
                allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256);

                // Note: allowedSuiteBCiphers bitset will be set by the service once the

                // certificates are attached to this profile

                requirePMF = true;

                requirePmf = true;

                break;

            case SECURITY_TYPE_OWE:

                allowedProtocols.set(WifiConfiguration.Protocol.RSN);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);

                requirePMF = true;

                requirePmf = true;

                break;

            case SECURITY_TYPE_WAPI_PSK:

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WAPI_PSK);
@@ -662,7 +662,7 @@ public class WifiConfiguration implements Parcelable { 
     * @hide

     */

    @SystemApi

    public boolean requirePMF;

    public boolean requirePmf;



    /**

     * Update identifier, for Passpoint network.
@@ -2169,7 +2169,7 @@ public class WifiConfiguration implements Parcelable { 
                append(" BSSID: ").append(this.BSSID).append(" FQDN: ").append(this.FQDN)

                .append(" PRIO: ").append(this.priority)

                .append(" HIDDEN: ").append(this.hiddenSSID)

                .append(" PMF: ").append(this.requirePMF)

                .append(" PMF: ").append(this.requirePmf)

                .append("CarrierId: ").append(this.carrierId)

                .append('\n');
@@ -2761,7 +2761,7 @@ public class WifiConfiguration implements Parcelable { 
            mRandomizedMacAddress = source.mRandomizedMacAddress;

            macRandomizationSetting = source.macRandomizationSetting;

            randomizedMacExpirationTimeMs = source.randomizedMacExpirationTimeMs;

            requirePMF = source.requirePMF;

            requirePmf = source.requirePmf;

            updateIdentifier = source.updateIdentifier;

            carrierId = source.carrierId;

            mPasspointUniqueId = source.mPasspointUniqueId;
@@ -2793,7 +2793,7 @@ public class WifiConfiguration implements Parcelable { 
        dest.writeInt(wepTxKeyIndex);

        dest.writeInt(priority);

        dest.writeInt(hiddenSSID ? 1 : 0);

        dest.writeInt(requirePMF ? 1 : 0);

        dest.writeInt(requirePmf ? 1 : 0);

        dest.writeString(updateIdentifier);



        writeBitSet(dest, allowedKeyManagement);
@@ -2869,7 +2869,7 @@ public class WifiConfiguration implements Parcelable { 
                config.wepTxKeyIndex = in.readInt();

                config.priority = in.readInt();

                config.hiddenSSID = in.readInt() != 0;

                config.requirePMF = in.readInt() != 0;

                config.requirePmf = in.readInt() != 0;

                config.updateIdentifier = in.readString();



                config.allowedKeyManagement   = readBitSet(in);

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

+3 −3
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ public class WifiConfigurationTest { 
        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.CCMP));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.CCMP));

        assertTrue(config.requirePMF);

        assertTrue(config.requirePmf);

    }



    /**
@@ -380,7 +380,7 @@ public class WifiConfigurationTest { 
        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.CCMP));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.CCMP));

        assertTrue(config.requirePMF);

        assertTrue(config.requirePmf);

    }



    /**
@@ -399,7 +399,7 @@ public class WifiConfigurationTest { 
        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(config.allowedGroupManagementCiphers

                .get(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256));

        assertTrue(config.requirePMF);

        assertTrue(config.requirePmf);

    }



    /**