From f52a8f6ef7baed21af72bef81b8ed8a92437ee2f Mon Sep 17 00:00:00 2001 From: Jan Nordqvist Date: Wed, 3 Feb 2016 13:01:03 -0800 Subject: [PATCH] Fixed API merge issue in master. Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073 --- api/test-current.txt | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/api/test-current.txt b/api/test-current.txt index 6d5dd34570a7..518739165d70 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 getConfiguredNetworks(); method public android.net.wifi.WifiInfo getConnectionInfo(); method public android.net.DhcpInfo getDhcpInfo(); - method public java.util.List getScanInfos(); method public java.util.List 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); -- 2.11.0