diff options
| -rw-r--r-- | api/current.txt | 15 | ||||
| -rwxr-xr-x | api/system-current.txt | 12 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/SoftApConfiguration.java | 47 |
3 files changed, 51 insertions, 23 deletions
diff --git a/api/current.txt b/api/current.txt index d5ece2e7301c..c55ccc3ce80d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30409,6 +30409,21 @@ package android.net.wifi { field public CharSequence venueName; } + public final class SoftApConfiguration implements android.os.Parcelable { + method public int describeContents(); + method @Nullable public android.net.MacAddress getBssid(); + method @Nullable public String getPassphrase(); + method public int getSecurityType(); + method @Nullable public String getSsid(); + method public boolean isHiddenSsid(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApConfiguration> CREATOR; + field public static final int SECURITY_TYPE_OPEN = 0; // 0x0 + field public static final int SECURITY_TYPE_WPA2_PSK = 1; // 0x1 + field public static final int SECURITY_TYPE_WPA3_SAE = 3; // 0x3 + field public static final int SECURITY_TYPE_WPA3_SAE_TRANSITION = 2; // 0x2 + } + public enum SupplicantState implements android.os.Parcelable { method public int describeContents(); method public static boolean isValidState(android.net.wifi.SupplicantState); diff --git a/api/system-current.txt b/api/system-current.txt index d9d9a4d1377f..76c8ba3e3906 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6001,29 +6001,17 @@ package android.net.wifi { } public final class SoftApConfiguration implements android.os.Parcelable { - method public int describeContents(); method @NonNull public java.util.List<android.net.MacAddress> getAllowedClientList(); method public int getBand(); method @NonNull public java.util.List<android.net.MacAddress> getBlockedClientList(); - method @Nullable public android.net.MacAddress getBssid(); method public int getChannel(); method public int getMaxNumberOfClients(); - method @Nullable public String getPassphrase(); - method public int getSecurityType(); method public int getShutdownTimeoutMillis(); - method @Nullable public String getSsid(); method public boolean isClientControlByUserEnabled(); - method public boolean isHiddenSsid(); - method public void writeToParcel(@NonNull android.os.Parcel, int); field public static final int BAND_2GHZ = 1; // 0x1 field public static final int BAND_5GHZ = 2; // 0x2 field public static final int BAND_6GHZ = 4; // 0x4 field public static final int BAND_ANY = 7; // 0x7 - field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApConfiguration> CREATOR; - field public static final int SECURITY_TYPE_OPEN = 0; // 0x0 - field public static final int SECURITY_TYPE_WPA2_PSK = 1; // 0x1 - field public static final int SECURITY_TYPE_WPA3_SAE = 3; // 0x3 - field public static final int SECURITY_TYPE_WPA3_SAE_TRANSITION = 2; // 0x2 } public static final class SoftApConfiguration.Builder { diff --git a/wifi/java/android/net/wifi/SoftApConfiguration.java b/wifi/java/android/net/wifi/SoftApConfiguration.java index a77d30a18817..1da9aad7cc39 100644 --- a/wifi/java/android/net/wifi/SoftApConfiguration.java +++ b/wifi/java/android/net/wifi/SoftApConfiguration.java @@ -54,13 +54,12 @@ import java.util.concurrent.Executor; * Instances of this class are immutable; use {@link SoftApConfiguration.Builder} and its methods to * create a new instance. * - * @hide */ -@SystemApi public final class SoftApConfiguration implements Parcelable { @VisibleForTesting static final int PSK_MIN_LEN = 8; + @VisibleForTesting static final int PSK_MAX_LEN = 63; @@ -207,22 +206,24 @@ public final class SoftApConfiguration implements Parcelable { private final int mShutdownTimeoutMillis; /** - * Security types we support. + * THe definition of security type OPEN. */ - /** @hide */ - @SystemApi public static final int SECURITY_TYPE_OPEN = 0; - /** @hide */ - @SystemApi + + /** + * The definition of security type WPA2-PSK. + */ public static final int SECURITY_TYPE_WPA2_PSK = 1; - /** @hide */ - @SystemApi + /** + * The definition of security type WPA3-SAE Transition mode. + */ public static final int SECURITY_TYPE_WPA3_SAE_TRANSITION = 2; - /** @hide */ - @SystemApi + /** + * The definition of security type WPA3-SAE. + */ public static final int SECURITY_TYPE_WPA3_SAE = 3; /** @hide */ @@ -383,7 +384,10 @@ public final class SoftApConfiguration implements Parcelable { /** * Returns {@link BandType} set to be the band for the AP. * {@link Builder#setBand(@BandType int)}. + * + * @hide */ + @SystemApi public @BandType int getBand() { return mBand; } @@ -391,7 +395,10 @@ public final class SoftApConfiguration implements Parcelable { /** * Returns Integer set to be the channel for the AP. * {@link Builder#setChannel(int)}. + * + * @hide */ + @SystemApi public int getChannel() { return mChannel; } @@ -408,7 +415,10 @@ public final class SoftApConfiguration implements Parcelable { /** * Returns the maximum number of clients that can associate to the AP. * {@link Builder#setMaxNumberOfClients(int)}. + * + * @hide */ + @SystemApi public int getMaxNumberOfClients() { return mMaxNumberOfClients; } @@ -417,7 +427,10 @@ public final class SoftApConfiguration implements Parcelable { * Returns the shutdown timeout in milliseconds. * The Soft AP will shutdown when there are no devices associated to it for * the timeout duration. See {@link Builder#setShutdownTimeoutMillis(int)}. + * + * @hide */ + @SystemApi public int getShutdownTimeoutMillis() { return mShutdownTimeoutMillis; } @@ -426,7 +439,10 @@ public final class SoftApConfiguration implements Parcelable { * Returns a flag indicating whether clients need to be pre-approved by the user. * (true: authorization required) or not (false: not required). * {@link Builder#enableClientControlByUser(Boolean)}. + * + * @hide */ + @SystemApi public boolean isClientControlByUserEnabled() { return mClientControlByUser; } @@ -435,8 +451,11 @@ public final class SoftApConfiguration implements Parcelable { * Returns List of clients which aren't allowed to associate to the AP. * * Clients are configured using {@link Builder#setClientList(List, List)} + * + * @hide */ @NonNull + @SystemApi public List<MacAddress> getBlockedClientList() { return mBlockedClientList; } @@ -444,8 +463,11 @@ public final class SoftApConfiguration implements Parcelable { /** * List of clients which are allowed to associate to the AP. * Clients are configured using {@link Builder#setClientList(List, List)} + * + * @hide */ @NonNull + @SystemApi public List<MacAddress> getAllowedClientList() { return mAllowedClientList; } @@ -456,7 +478,10 @@ public final class SoftApConfiguration implements Parcelable { * * All fields are optional. By default, SSID and BSSID are automatically chosen by the * framework, and an open network is created. + * + * @hide */ + @SystemApi public static final class Builder { private String mSsid; private MacAddress mBssid; |