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

Commit f52a8f6e authored by Jan Nordqvist's avatar Jan Nordqvist
Browse files

Fixed API merge issue in master. 

Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073
parent db204e9a

api/test-current.txt

+1 −18
Original line number Diff line number Diff line
@@ -24350,22 +24350,6 @@ package android.net.sip { 














package android.net.wifi {



























  public class ScanInfo implements android.os.Parcelable {













    ctor public ScanInfo(android.net.wifi.ScanResult);













    ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int);













    method public int describeContents();













    method public long getBssid();













    method public byte[] getIconData();













    method public java.lang.String getIconType();













    method public java.lang.String getName();













    method public int getOsuIdentity();













    method public int getRssi();













    method public android.net.wifi.ScanResult getScanResult();













    method public java.lang.String getServiceDescription();













    method public java.lang.String getSsid();













    method public void writeToParcel(android.os.Parcel, int);













  }



























  public class ScanResult implements android.os.Parcelable {















    method public int describeContents();















    method public boolean is80211mcResponder();










@@ -24526,6 +24510,7 @@ package android.net.wifi {













    field public static final int SIM = 4; // 0x4















    field public static final int TLS = 1; // 0x1















    field public static final int TTLS = 2; // 0x2













    field public static final int UNAUTH_TLS = 7; // 0x7















  }





























  public static final class WifiEnterpriseConfig.Phase2 {










@@ -24568,7 +24553,6 @@ package android.net.wifi {













    method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();















    method public android.net.wifi.WifiInfo getConnectionInfo();















    method public android.net.DhcpInfo getDhcpInfo();













    method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();















    method public java.util.List<android.net.wifi.ScanResult> getScanResults();















    method public int getWifiState();















    method public boolean is5GHzBandSupported();









@@ -24584,7 +24568,6 @@ package android.net.wifi {













    method public boolean reconnect();















    method public boolean removeNetwork(int);















    method public boolean saveConfiguration();













    method public void setOsuSelection(int);















    method public void setTdlsEnabled(java.net.InetAddress, boolean);















    method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);















    method public boolean setWifiEnabled(boolean);