diff options
| -rwxr-xr-x | api/system-current.txt | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/SoftApConfiguration.java | 29 |
2 files changed, 0 insertions, 31 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 75e8f462f4c3..367956c27721 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5839,7 +5839,6 @@ package android.net.wifi { method public int getSecurityType(); method public int getShutdownTimeoutMillis(); method @Nullable public String getSsid(); - method @Nullable public String getWpa2Passphrase(); method public boolean isHiddenSsid(); method public void writeToParcel(@NonNull android.os.Parcel, int); field public static final int BAND_2GHZ = 1; // 0x1 @@ -5865,7 +5864,6 @@ package android.net.wifi { method @NonNull public android.net.wifi.SoftApConfiguration.Builder setPassphrase(@Nullable String, int); method @NonNull public android.net.wifi.SoftApConfiguration.Builder setShutdownTimeoutMillis(int); method @NonNull public android.net.wifi.SoftApConfiguration.Builder setSsid(@Nullable String); - method @NonNull public android.net.wifi.SoftApConfiguration.Builder setWpa2Passphrase(@Nullable String); } public final class SoftApInfo implements android.os.Parcelable { diff --git a/wifi/java/android/net/wifi/SoftApConfiguration.java b/wifi/java/android/net/wifi/SoftApConfiguration.java index 945a23605b74..2b7f8af728d7 100644 --- a/wifi/java/android/net/wifi/SoftApConfiguration.java +++ b/wifi/java/android/net/wifi/SoftApConfiguration.java @@ -326,19 +326,6 @@ public final class SoftApConfiguration implements Parcelable { return mBssid; } - // TODO: Remove it after update the caller - /** - * Returns String set to be passphrase for the WPA2-PSK AP. - * {@link #setWpa2Passphrase(String)}. - */ - @Nullable - public String getWpa2Passphrase() { - if (mSecurityType == SECURITY_TYPE_WPA2_PSK) { - return mPassphrase; - } - return null; - } - /** * Returns String set to be passphrase for current AP. * {@link #setPassphrase(String, @SecurityType int)}. @@ -505,22 +492,6 @@ public final class SoftApConfiguration implements Parcelable { return this; } - // TODO: Remove it after update the caller - /** - * Specifies that this AP should use WPA2-PSK with the given ASCII WPA2 passphrase. - * When set to null, an open network is created. - * <p> - * - * @param passphrase The passphrase to use, or null to unset a previously-set WPA2-PSK - * configuration. - * @return Builder for chaining. - * @throws IllegalArgumentException when the passphrase is the empty string - */ - @NonNull - public Builder setWpa2Passphrase(@Nullable String passphrase) { - return setPassphrase(passphrase, SECURITY_TYPE_WPA2_PSK); - } - /** * Specifies that this AP should use specific security type with the given ASCII passphrase. * |