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

Commit fc45311a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[WifiConfiguration] Add @NonNull annotations to BitSets"

parents 420fb7c4 405ecb99

api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -29790,13 +29790,13 @@ package android.net.wifi { 
    field @Deprecated public String BSSID;

    field @Deprecated public String FQDN;

    field @Deprecated public String SSID;

    field @Deprecated public java.util.BitSet allowedAuthAlgorithms;

    field @Deprecated public java.util.BitSet allowedGroupCiphers;

    field @Deprecated public java.util.BitSet allowedGroupManagementCiphers;

    field @Deprecated public java.util.BitSet allowedKeyManagement;

    field @Deprecated public java.util.BitSet allowedPairwiseCiphers;

    field @Deprecated public java.util.BitSet allowedProtocols;

    field @Deprecated public java.util.BitSet allowedSuiteBCiphers;

    field @Deprecated @NonNull public java.util.BitSet allowedAuthAlgorithms;

    field @Deprecated @NonNull public java.util.BitSet allowedGroupCiphers;

    field @Deprecated @NonNull public java.util.BitSet allowedGroupManagementCiphers;

    field @Deprecated @NonNull public java.util.BitSet allowedKeyManagement;

    field @Deprecated @NonNull public java.util.BitSet allowedPairwiseCiphers;

    field @Deprecated @NonNull public java.util.BitSet allowedProtocols;

    field @Deprecated @NonNull public java.util.BitSet allowedSuiteBCiphers;

    field @Deprecated public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;

    field @Deprecated public boolean hiddenSSID;

    field @Deprecated public boolean isHomeProviderNetwork;

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

+7 −0
Original line number Diff line number Diff line
@@ -561,41 +561,48 @@ public class WifiConfiguration implements Parcelable { 
     * See {@link KeyMgmt} for descriptions of the values.

     * Defaults to WPA-PSK WPA-EAP.

     */

    @NonNull

    public BitSet allowedKeyManagement;

    /**

     * The set of security protocols supported by this configuration.

     * See {@link Protocol} for descriptions of the values.

     * Defaults to WPA RSN.

     */

    @NonNull

    public BitSet allowedProtocols;

    /**

     * The set of authentication protocols supported by this configuration.

     * See {@link AuthAlgorithm} for descriptions of the values.

     * Defaults to automatic selection.

     */

    @NonNull

    public BitSet allowedAuthAlgorithms;

    /**

     * The set of pairwise ciphers for WPA supported by this configuration.

     * See {@link PairwiseCipher} for descriptions of the values.

     * Defaults to CCMP TKIP.

     */

    @NonNull

    public BitSet allowedPairwiseCiphers;

    /**

     * The set of group ciphers supported by this configuration.

     * See {@link GroupCipher} for descriptions of the values.

     * Defaults to CCMP TKIP WEP104 WEP40.

     */

    @NonNull

    public BitSet allowedGroupCiphers;

    /**

     * The set of group management ciphers supported by this configuration.

     * See {@link GroupMgmtCipher} for descriptions of the values.

     */

    @NonNull

    public BitSet allowedGroupManagementCiphers;

    /**

     * The set of SuiteB ciphers supported by this configuration.

     * To be used for WPA3-Enterprise mode.

     * See {@link SuiteBCipher} for descriptions of the values.

     */

    @NonNull

    public BitSet allowedSuiteBCiphers;

    /**

     * The enterprise configuration details specifying the EAP method,