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

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

Merge "WifiConfiguration: Remove IpConfiguration helpers"

parents bf3e4555 762a9e3a

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -7510,20 +7510,16 @@ package android.net.wifi { 














  @Deprecated public class WifiConfiguration implements android.os.Parcelable {















    method @Deprecated public int getAuthType();













    method @Deprecated @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment();















    method @Deprecated @NonNull public android.net.IpConfiguration getIpConfiguration();















    method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus getNetworkSelectionStatus();















    method @Deprecated @NonNull public String getPrintableSsid();













    method @Deprecated @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings();















    method @Deprecated public int getRecentFailureReason();













    method @Deprecated @Nullable public android.net.StaticIpConfiguration getStaticIpConfiguration();















    method @Deprecated public boolean hasNoInternetAccess();















    method @Deprecated public boolean isEphemeral();















    method @Deprecated public static boolean isMetered(@Nullable android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiInfo);















    method @Deprecated public boolean isNoInternetAccessExpected();















    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);















    method @Deprecated public void setNetworkSelectionStatus(@NonNull android.net.wifi.WifiConfiguration.NetworkSelectionStatus);













    method @Deprecated public void setProxy(@NonNull android.net.IpConfiguration.ProxySettings, @NonNull android.net.ProxyInfo);















    field @Deprecated public static final int AP_BAND_2GHZ = 0; // 0x0















    field @Deprecated public static final int AP_BAND_5GHZ = 1; // 0x1















    field @Deprecated public static final int AP_BAND_ANY = -1; // 0xffffffff

































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



+4
−4




























Original line number
Diff line number
Diff line








@@ -2533,7 +2533,7 @@ public class WifiConfiguration implements Parcelable {













     * @hide















     */















    @Nullable













    @SystemApi













    @UnsupportedAppUsage















    public StaticIpConfiguration getStaticIpConfiguration() {















        return mIpConfiguration.getStaticIpConfiguration();















    }









@@ -2549,7 +2549,7 @@ public class WifiConfiguration implements Parcelable {













     * @hide















     */















    @NonNull













    @SystemApi













    @UnsupportedAppUsage















    public IpConfiguration.IpAssignment getIpAssignment() {















        return mIpConfiguration.getIpAssignment();















    }









@@ -2565,7 +2565,7 @@ public class WifiConfiguration implements Parcelable {













     * @hide















     */















    @NonNull













    @SystemApi













    @UnsupportedAppUsage















    public IpConfiguration.ProxySettings getProxySettings() {















        return mIpConfiguration.getProxySettings();















    }










@@ -2628,7 +2628,7 @@ public class WifiConfiguration implements Parcelable {













     * Set the {@link ProxySettings} and {@link ProxyInfo} for this network.















     * @hide















     */













    @SystemApi













    @UnsupportedAppUsage















    public void setProxy(@NonNull ProxySettings settings, @NonNull ProxyInfo proxy) {















        mIpConfiguration.setProxySettings(settings);















        mIpConfiguration.setHttpProxy(proxy);