am "Revert "Initial Passpoint code.""

merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."

1 files changed, 0 insertions, 766 deletions

diff --git a/api/current.txt b/api/current.txt
index 4eb147a..16de605 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18137,772 +18137,6 @@ package android.net.wifi {
 
 }
 
-package android.net.wifi.anqp {
-
-  public abstract class ANQPElement {
-    ctor protected ANQPElement(android.net.wifi.anqp.Constants.ANQPElementType);
-    method public android.net.wifi.anqp.Constants.ANQPElementType getID();
-  }
-
-  public class ANQPFactory {
-    ctor public ANQPFactory();
-    method public static java.util.List<android.net.wifi.anqp.ANQPElement> parsePayload(java.nio.ByteBuffer) throws java.net.ProtocolException;
-  }
-
-  public class CapabilityListElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public CapabilityListElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.Constants.ANQPElementType[] getCapabilities();
-  }
-
-  public class CivicLocationElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public CivicLocationElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.Locale getLocale();
-    method public android.net.wifi.anqp.CivicLocationElement.LocationType getLocationType();
-    method public java.util.Map<android.net.wifi.anqp.CivicLocationElement.CAType, java.lang.String> getValues();
-    field public static final int ADDITIONAL_CODE = 32; // 0x20
-    field public static final int ADDITIONAL_LOCATION = 22; // 0x16
-    field public static final int BLOCK = 5; // 0x5
-    field public static final int BRANCH_ROAD = 36; // 0x24
-    field public static final int BUILDING = 25; // 0x19
-    field public static final int CITY = 3; // 0x3
-    field public static final int COUNTY_DISTRICT = 2; // 0x2
-    field public static final int DIVISION_BOROUGH = 4; // 0x4
-    field public static final int FLOOR = 27; // 0x1b
-    field public static final int HOUSE_NUMBER = 19; // 0x13
-    field public static final int HOUSE_NUMBER_SUFFIX = 20; // 0x14
-    field public static final int LANDMARK = 21; // 0x15
-    field public static final int LANGUAGE = 0; // 0x0
-    field public static final int LEADING_STREET_SUFFIX = 17; // 0x11
-    field public static final int NAME = 23; // 0x17
-    field public static final int POSTAL_COMMUNITY = 30; // 0x1e
-    field public static final int POSTAL_ZIP = 24; // 0x18
-    field public static final int PO_BOX = 31; // 0x1f
-    field public static final int PRIMARY_ROAD = 34; // 0x22
-    field public static final int RESERVED = 255; // 0xff
-    field public static final int ROAD_SECTION = 35; // 0x23
-    field public static final int ROOM = 28; // 0x1c
-    field public static final int SCRIPT = 128; // 0x80
-    field public static final int SEAT_DESK = 33; // 0x21
-    field public static final int STATE_PROVINCE = 1; // 0x1
-    field public static final int STREET_DIRECTION = 16; // 0x10
-    field public static final int STREET_GROUP = 6; // 0x6
-    field public static final int STREET_NAME_POST_MOD = 39; // 0x27
-    field public static final int STREET_NAME_PRE_MOD = 38; // 0x26
-    field public static final int STREET_SUFFIX = 18; // 0x12
-    field public static final int SUB_BRANCH_ROAD = 37; // 0x25
-    field public static final int TYPE = 29; // 0x1d
-    field public static final int UNIT = 26; // 0x1a
-  }
-
-  public static final class CivicLocationElement.CAType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.CivicLocationElement.CAType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.CivicLocationElement.CAType[] values();
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType AdditionalCode;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType AdditionalLocation;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Block;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType BranchRoad;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Building;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType City;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType CountyDistrict;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType DivisionBorough;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Floor;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType HouseNumber;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType HouseNumberSuffix;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Landmark;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Language;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType LeadingStreetSuffix;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Name;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType POBox;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType PostalCommunity;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType PostalZIP;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType PrimaryRoad;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Reserved;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType RoadSection;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Room;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Script;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType SeatDesk;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType StateProvince;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType StreetDirection;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType StreetGroup;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType StreetNamePostMod;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType StreetNamePreMod;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType StreetSuffix;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType SubBranchRoad;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Type;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.CAType Unit;
-  }
-
-  public static final class CivicLocationElement.LocationType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.CivicLocationElement.LocationType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.CivicLocationElement.LocationType[] values();
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.LocationType Client;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.LocationType DHCPServer;
-    enum_constant public static final android.net.wifi.anqp.CivicLocationElement.LocationType NwkElement;
-  }
-
-  public class Constants {
-    ctor public Constants();
-    method public static long getInteger(java.nio.ByteBuffer, int);
-    method public static java.lang.String getPrefixedString(java.nio.ByteBuffer, int, java.nio.charset.Charset) throws java.net.ProtocolException;
-    method public static java.lang.String getString(java.nio.ByteBuffer, int, java.nio.charset.Charset) throws java.net.ProtocolException;
-    method public static java.lang.String getString(java.nio.ByteBuffer, int, java.nio.charset.Charset, boolean) throws java.net.ProtocolException;
-    method public static android.net.wifi.anqp.Constants.ANQPElementType mapANQPElement(int);
-    method public static android.net.wifi.anqp.Constants.ANQPElementType mapHS20Element(int);
-    method public static java.lang.String toHexString(byte[]);
-    field public static final int ANQP_3GPP_NETWORK = 264; // 0x108
-    field public static final int ANQP_CAPABILITY_LIST = 257; // 0x101
-    field public static final int ANQP_CIVIC_LOC = 266; // 0x10a
-    field public static final int ANQP_DOM_NAME = 268; // 0x10c
-    field public static final int ANQP_EMERGENCY_ALERT = 269; // 0x10d
-    field public static final int ANQP_EMERGENCY_NAI = 271; // 0x10f
-    field public static final int ANQP_EMERGENCY_NUMBER = 259; // 0x103
-    field public static final int ANQP_GEO_LOC = 265; // 0x109
-    field public static final int ANQP_IP_ADDR_AVAILABILITY = 262; // 0x106
-    field public static final int ANQP_LOC_URI = 267; // 0x10b
-    field public static final int ANQP_NAI_REALM = 263; // 0x107
-    field public static final int ANQP_NEIGHBOR_REPORT = 272; // 0x110
-    field public static final int ANQP_NWK_AUTH_TYPE = 260; // 0x104
-    field public static final int ANQP_QUERY_LIST = 256; // 0x100
-    field public static final int ANQP_ROAMING_CONSORTIUM = 261; // 0x105
-    field public static final int ANQP_TDLS_CAP = 270; // 0x10e
-    field public static final int ANQP_VENDOR_SPEC = 56797; // 0xdddd
-    field public static final int ANQP_VENUE_NAME = 258; // 0x102
-    field public static final int BYTES_IN_INT = 4; // 0x4
-    field public static final int BYTES_IN_SHORT = 2; // 0x2
-    field public static final int BYTE_MASK = 255; // 0xff
-    field public static final int HS20Type = 17; // 0x11
-    field public static final int HS20_OI_LENGTH = 3; // 0x3
-    field public static final int HS20_VID = 5271450; // 0x506f9a
-    field public static final int HS_CAPABILITY_LIST = 2; // 0x2
-    field public static final int HS_CONN_CAPABILITY = 5; // 0x5
-    field public static final int HS_FRIENDLY_NAME = 3; // 0x3
-    field public static final int HS_ICON_FILE = 11; // 0xb
-    field public static final int HS_ICON_REQUEST = 10; // 0xa
-    field public static final int HS_NAI_HOME_REALM_QUERY = 6; // 0x6
-    field public static final int HS_OPERATING_CLASS = 7; // 0x7
-    field public static final int HS_OSU_PROVIDERS = 8; // 0x8
-    field public static final int HS_QUERY_LIST = 1; // 0x1
-    field public static final int HS_WAN_METRICS = 4; // 0x4
-    field public static final long INT_MASK = 4294967295L; // 0xffffffffL
-    field public static final int SHORT_MASK = 65535; // 0xffff
-  }
-
-  public static final class Constants.ANQPElementType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.Constants.ANQPElementType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.Constants.ANQPElementType[] values();
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQP3GPPNetwork;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPCapabilityList;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPCivicLoc;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPDomName;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPEmergencyAlert;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPEmergencyNAI;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPEmergencyNumber;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPGeoLoc;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPIPAddrAvailability;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPLocURI;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPNAIRealm;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPNeighborReport;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPNwkAuthType;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPQueryList;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPRoamingConsortium;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPTDLSCap;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPVendorSpec;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType ANQPVenueName;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSCapabilityList;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSConnCapability;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSFriendlyName;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSIconFile;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSIconRequest;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSNAIHomeRealmQuery;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSOSUProviders;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSOperatingclass;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSQueryList;
-    enum_constant public static final android.net.wifi.anqp.Constants.ANQPElementType HSWANMetrics;
-  }
-
-  public static final class Constants.IconStatus extends java.lang.Enum {
-    method public static android.net.wifi.anqp.Constants.IconStatus valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.Constants.IconStatus[] values();
-    enum_constant public static final android.net.wifi.anqp.Constants.IconStatus FileNotFound;
-    enum_constant public static final android.net.wifi.anqp.Constants.IconStatus Success;
-    enum_constant public static final android.net.wifi.anqp.Constants.IconStatus Unspecified;
-  }
-
-  public class DomainNameElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public DomainNameElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<java.lang.String> getDomains();
-  }
-
-  public class EmergencyNumberElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public EmergencyNumberElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<java.lang.String> getNumbers();
-  }
-
-  public class GEOLocationElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public GEOLocationElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.GEOLocationElement.RealValue getAltitude();
-    method public android.net.wifi.anqp.GEOLocationElement.AltitudeType getAltitudeType();
-    method public android.net.wifi.anqp.GEOLocationElement.Datum getDatum();
-    method public android.net.wifi.anqp.GEOLocationElement.RealValue getLatitude();
-    method public android.net.wifi.anqp.GEOLocationElement.RealValue getLongitude();
-  }
-
-  public static final class GEOLocationElement.AltitudeType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.GEOLocationElement.AltitudeType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.GEOLocationElement.AltitudeType[] values();
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.AltitudeType Floors;
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.AltitudeType Meters;
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.AltitudeType Unknown;
-  }
-
-  public static final class GEOLocationElement.Datum extends java.lang.Enum {
-    method public static android.net.wifi.anqp.GEOLocationElement.Datum valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.GEOLocationElement.Datum[] values();
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.Datum NAD83Land;
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.Datum NAD83Water;
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.Datum Unknown;
-    enum_constant public static final android.net.wifi.anqp.GEOLocationElement.Datum WGS84;
-  }
-
-  public static class GEOLocationElement.RealValue {
-    ctor public GEOLocationElement.RealValue(double);
-    ctor public GEOLocationElement.RealValue(double, int);
-    method public int getResolution();
-    method public double getValue();
-    method public boolean isResolutionSet();
-  }
-
-  public class GenericBlobElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public GenericBlobElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer);
-    method public byte[] getData();
-  }
-
-  public class GenericStringElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public GenericStringElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.lang.String getM_text();
-  }
-
-  public class HSCapabilityListElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public HSCapabilityListElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.Constants.ANQPElementType[] getCapabilities();
-  }
-
-  public class HSConnectionCapabilityElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public HSConnectionCapabilityElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.HSConnectionCapabilityElement.ProtocolTuple> getStatusList();
-  }
-
-  public static final class HSConnectionCapabilityElement.ProtoStatus extends java.lang.Enum {
-    method public static android.net.wifi.anqp.HSConnectionCapabilityElement.ProtoStatus valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.HSConnectionCapabilityElement.ProtoStatus[] values();
-    enum_constant public static final android.net.wifi.anqp.HSConnectionCapabilityElement.ProtoStatus Closed;
-    enum_constant public static final android.net.wifi.anqp.HSConnectionCapabilityElement.ProtoStatus Open;
-    enum_constant public static final android.net.wifi.anqp.HSConnectionCapabilityElement.ProtoStatus Unknown;
-  }
-
-  public static class HSConnectionCapabilityElement.ProtocolTuple {
-    method public int getPort();
-    method public int getProtocol();
-    method public android.net.wifi.anqp.HSConnectionCapabilityElement.ProtoStatus getStatus();
-  }
-
-  public class HSFriendlyNameElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public HSFriendlyNameElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.I18Name> getNames();
-  }
-
-  public class HSIconFileElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public HSIconFileElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public byte[] getIconData();
-    method public android.net.wifi.anqp.HSIconFileElement.StatusCode getStatusCode();
-    method public java.lang.String getType();
-  }
-
-  public static final class HSIconFileElement.StatusCode extends java.lang.Enum {
-    method public static android.net.wifi.anqp.HSIconFileElement.StatusCode valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.HSIconFileElement.StatusCode[] values();
-    enum_constant public static final android.net.wifi.anqp.HSIconFileElement.StatusCode FileNotFound;
-    enum_constant public static final android.net.wifi.anqp.HSIconFileElement.StatusCode Success;
-    enum_constant public static final android.net.wifi.anqp.HSIconFileElement.StatusCode Unspecified;
-  }
-
-  public class HSOsuProvidersElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public HSOsuProvidersElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.OSUProvider> getProviders();
-    method public java.lang.String getSSID();
-  }
-
-  public class HSWanMetricsElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public HSWanMetricsElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public int getDlLoad();
-    method public long getDlSpeed();
-    method public int getLMD();
-    method public android.net.wifi.anqp.HSWanMetricsElement.LinkStatus getStatus();
-    method public int getUlLoad();
-    method public long getUlSpeed();
-    method public boolean isCapped();
-    method public boolean isSymmetric();
-  }
-
-  public static final class HSWanMetricsElement.LinkStatus extends java.lang.Enum {
-    method public static android.net.wifi.anqp.HSWanMetricsElement.LinkStatus valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.HSWanMetricsElement.LinkStatus[] values();
-    enum_constant public static final android.net.wifi.anqp.HSWanMetricsElement.LinkStatus Down;
-    enum_constant public static final android.net.wifi.anqp.HSWanMetricsElement.LinkStatus Reserved;
-    enum_constant public static final android.net.wifi.anqp.HSWanMetricsElement.LinkStatus Test;
-    enum_constant public static final android.net.wifi.anqp.HSWanMetricsElement.LinkStatus Up;
-  }
-
-  public class I18Name {
-    ctor public I18Name(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.Locale getLocale();
-    method public java.lang.String getText();
-  }
-
-  public class IPAddressTypeAvailabilityElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public IPAddressTypeAvailabilityElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability getV4Availability();
-    method public android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability getV6Availability();
-  }
-
-  public static final class IPAddressTypeAvailabilityElement.IPv4Availability extends java.lang.Enum {
-    method public static android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability[] values();
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability DoubleNAT;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability NotAvailable;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability PortRestricted;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability PortRestrictedAndDoubleNAT;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability PortRestrictedAndSingleNAT;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability Public;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability SingleNATA;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv4Availability Unknown;
-  }
-
-  public static final class IPAddressTypeAvailabilityElement.IPv6Availability extends java.lang.Enum {
-    method public static android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability[] values();
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability Available;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability NotAvailable;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability Reserved;
-    enum_constant public static final android.net.wifi.anqp.IPAddressTypeAvailabilityElement.IPv6Availability Unknown;
-  }
-
-  public class IconInfo {
-    ctor public IconInfo(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.lang.String getFileName();
-    method public int getHeight();
-    method public java.lang.String getIconType();
-    method public java.util.Locale getLocale();
-    method public int getWidth();
-  }
-
-  public class NAIRealmData {
-    ctor public NAIRealmData(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.eap.EAPMethod> getEAPMethods();
-    method public java.util.List<java.lang.String> getRealms();
-  }
-
-  public class NAIRealmElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public NAIRealmElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.NAIRealmData> getRealmData();
-  }
-
-  public class NetworkAuthenticationTypeElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public NetworkAuthenticationTypeElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.NetworkAuthenticationTypeElement.NetworkAuthentication> getAuthenticationTypes();
-  }
-
-  public static class NetworkAuthenticationTypeElement.NetworkAuthentication {
-    method public android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum getType();
-    method public java.lang.String getURL();
-  }
-
-  public static final class NetworkAuthenticationTypeElement.NwkAuthTypeEnum extends java.lang.Enum {
-    method public static android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum[] values();
-    enum_constant public static final android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum DNSRedirection;
-    enum_constant public static final android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum HTTPRedirection;
-    enum_constant public static final android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum OnLineEnrollment;
-    enum_constant public static final android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum Reserved;
-    enum_constant public static final android.net.wifi.anqp.NetworkAuthenticationTypeElement.NwkAuthTypeEnum TermsAndConditions;
-  }
-
-  public class OSUProvider {
-    ctor public OSUProvider(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<android.net.wifi.anqp.IconInfo> getIcons();
-    method public java.util.List<android.net.wifi.anqp.I18Name> getNames();
-    method public java.util.List<android.net.wifi.anqp.OSUProvider.OSUMethod> getOSUMethods();
-    method public java.lang.String getOSUServer();
-    method public java.lang.String getOsuNai();
-    method public java.util.List<android.net.wifi.anqp.I18Name> getServiceDescriptions();
-  }
-
-  public static final class OSUProvider.OSUMethod extends java.lang.Enum {
-    method public static android.net.wifi.anqp.OSUProvider.OSUMethod valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.OSUProvider.OSUMethod[] values();
-    enum_constant public static final android.net.wifi.anqp.OSUProvider.OSUMethod OmaDm;
-    enum_constant public static final android.net.wifi.anqp.OSUProvider.OSUMethod SoapXml;
-  }
-
-  public class RoamingConsortiumElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public RoamingConsortiumElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.List<java.lang.Long> getOIs();
-  }
-
-  public class ThreeGPPNetworkElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public ThreeGPPNetworkElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer);
-    method public byte[] getData();
-  }
-
-  public class VenueNameElement extends android.net.wifi.anqp.ANQPElement {
-    ctor public VenueNameElement(android.net.wifi.anqp.Constants.ANQPElementType, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.VenueNameElement.VenueGroup getGroup();
-    method public java.util.List<android.net.wifi.anqp.I18Name> getNames();
-    method public android.net.wifi.anqp.VenueNameElement.VenueType getType();
-  }
-
-  public static final class VenueNameElement.VenueGroup extends java.lang.Enum {
-    method public static android.net.wifi.anqp.VenueNameElement.VenueGroup valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.VenueNameElement.VenueGroup[] values();
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Assembly;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Business;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Educational;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup FactoryIndustrial;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Institutional;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Mercantile;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Outdoor;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Reserved;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Residential;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Storage;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Unspecified;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup UtilityMiscellaneous;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueGroup Vehicular;
-  }
-
-  public static final class VenueNameElement.VenueType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.VenueNameElement.VenueType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.VenueNameElement.VenueType[] values();
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Airplane;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType AlcoholAndDrugRehabilitationCenter;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Amphitheater;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType AmusementPark;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Arena;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType AttorneyOffice;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType AutomobileOrTruck;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType AutomotiveServiceStation;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Bank;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Bar;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType BoardingHouse;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Bus;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType BusStop;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType CityPark;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType CoffeeShop;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType ConventionCenter;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType DoctorDentistoffice;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Dormitory;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType EmergencyCoordinationCenter;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Factory;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Ferry;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType FireStation;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType GasStation;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType GroceryMarket;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType GroupHome;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Hospital;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType HotelMotel;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Kiosk;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Library;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType LongTermCareFacility;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType MotorBike;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType MuniMeshNetwork;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Museum;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType PassengerTerminal;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType PlaceOfWorship;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType PoliceStation;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType PostOffice;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType PrisonJail;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType PrivateResidence;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType ProfessionalOffice;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType ResearchDevelopmentFacility;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Reserved;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType RestArea;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Restaurant;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType RetailStore;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType SchoolPrimary;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType SchoolSecondary;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType ShipOrBoat;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType ShoppingMall;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Stadium;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Theater;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType TrafficControl;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Train;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UniversityCollege;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType Unspecified;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedAssembly;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedBusiness;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedEducational;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedFactoryIndustrial;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedInstitutional;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedMercantile;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedOutdoor;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedResidential;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedStorage;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType UnspecifiedUtilityMiscellaneous;
-    enum_constant public static final android.net.wifi.anqp.VenueNameElement.VenueType ZooOrAquarium;
-  }
-
-}
-
-package android.net.wifi.anqp.eap {
-
-  public abstract interface AuthParam {
-    method public abstract android.net.wifi.anqp.eap.EAP.AuthInfoID getAuthInfoID();
-  }
-
-  public class Credential implements android.net.wifi.anqp.eap.AuthParam {
-    ctor public Credential(android.net.wifi.anqp.eap.EAP.AuthInfoID, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.eap.EAP.AuthInfoID getAuthInfoID();
-    method public android.net.wifi.anqp.eap.Credential.CredType getCredType();
-  }
-
-  public static final class Credential.CredType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.eap.Credential.CredType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.eap.Credential.CredType[] values();
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType Anonymous;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType Certificate;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType HWToken;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType NFC;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType None;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType Reserved;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType SIM;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType Softoken;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType USIM;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType Username;
-    enum_constant public static final android.net.wifi.anqp.eap.Credential.CredType VendorSpecific;
-  }
-
-  public abstract class EAP {
-    ctor public EAP();
-    method public static android.net.wifi.anqp.eap.EAP.EAPMethodID mapEAPMethod(int);
-    field public static final int CredentialType = 5; // 0x5
-    field public static final int EAP_3Com = 24; // 0x18
-    field public static final int EAP_AKA = 23; // 0x17
-    field public static final int EAP_AKAPrim = 50; // 0x32
-    field public static final int EAP_ActiontecWireless = 35; // 0x23
-    field public static final int EAP_EKE = 53; // 0x35
-    field public static final int EAP_FAST = 43; // 0x2b
-    field public static final int EAP_GPSK = 51; // 0x33
-    field public static final int EAP_HTTPDigest = 38; // 0x26
-    field public static final int EAP_IKEv2 = 49; // 0x31
-    field public static final int EAP_KEA = 11; // 0xb
-    field public static final int EAP_KEA_VALIDATE = 12; // 0xc
-    field public static final int EAP_LEAP = 17; // 0x11
-    field public static final int EAP_Link = 45; // 0x2d
-    field public static final int EAP_MD5 = 4; // 0x4
-    field public static final int EAP_MOBAC = 42; // 0x2a
-    field public static final int EAP_MSCHAPv2 = 26; // 0x1a
-    field public static final int EAP_OTP = 5; // 0x5
-    field public static final int EAP_PAX = 46; // 0x2e
-    field public static final int EAP_PEAP = 29; // 0x1d
-    field public static final int EAP_POTP = 32; // 0x20
-    field public static final int EAP_PSK = 47; // 0x2f
-    field public static final int EAP_PWD = 52; // 0x34
-    field public static final int EAP_RSA = 9; // 0x9
-    field public static final int EAP_SAKE = 48; // 0x30
-    field public static final int EAP_SIM = 18; // 0x12
-    field public static final int EAP_SPEKE = 41; // 0x29
-    field public static final int EAP_TEAP = 55; // 0x37
-    field public static final int EAP_TLS = 13; // 0xd
-    field public static final int EAP_TTLS = 21; // 0x15
-    field public static final int EAP_ZLXEAP = 44; // 0x2c
-    field public static final int ExpandedEAPMethod = 1; // 0x1
-    field public static final int ExpandedInnerEAPMethod = 4; // 0x4
-    field public static final int InnerAuthEAPMethodType = 3; // 0x3
-    field public static final int NonEAPInnerAuthType = 2; // 0x2
-    field public static final int TunneledEAPMethodCredType = 6; // 0x6
-    field public static final int VendorSpecific = 221; // 0xdd
-  }
-
-  public static final class EAP.AuthInfoID extends java.lang.Enum {
-    method public static android.net.wifi.anqp.eap.EAP.AuthInfoID valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.eap.EAP.AuthInfoID[] values();
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID CredentialType;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID ExpandedEAPMethod;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID ExpandedInnerEAPMethod;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID InnerAuthEAPMethodType;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID NonEAPInnerAuthType;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID TunneledEAPMethodCredType;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID Undefined;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.AuthInfoID VendorSpecific;
-  }
-
-  public static final class EAP.EAPMethodID extends java.lang.Enum {
-    method public static android.net.wifi.anqp.eap.EAP.EAPMethodID valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.eap.EAP.EAPMethodID[] values();
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_3Com;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_AKA;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_AKAPrim;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_ActiontecWireless;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_EKE;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_FAST;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_GPSK;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_HTTPDigest;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_IKEv2;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_KEA;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_KEA_VALIDATE;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_LEAP;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_Link;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_MD5;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_MOBAC;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_MSCHAPv2;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_OTP;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_PAX;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_PEAP;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_POTP;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_PSK;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_PWD;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_RSA;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_SAKE;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_SIM;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_SPEKE;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_TEAP;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_TLS;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_TTLS;
-    enum_constant public static final android.net.wifi.anqp.eap.EAP.EAPMethodID EAP_ZLXEAP;
-  }
-
-  public class EAPMethod {
-    ctor public EAPMethod(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public java.util.Map<android.net.wifi.anqp.eap.EAP.AuthInfoID, java.util.Set<android.net.wifi.anqp.eap.AuthParam>> getAuthParams();
-    method public android.net.wifi.anqp.eap.EAP.EAPMethodID getEAPMethodID();
-    method public boolean matchesAuthParams(android.net.wifi.anqp.eap.EAPMethod);
-  }
-
-  public class ExpandedEAPMethod implements android.net.wifi.anqp.eap.AuthParam {
-    ctor public ExpandedEAPMethod(android.net.wifi.anqp.eap.EAP.AuthInfoID, java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.eap.EAP.AuthInfoID getAuthInfoID();
-    method public int getVendorID();
-    method public long getVendorType();
-  }
-
-  public class InnerAuthEAP implements android.net.wifi.anqp.eap.AuthParam {
-    ctor public InnerAuthEAP(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.eap.EAP.AuthInfoID getAuthInfoID();
-    method public android.net.wifi.anqp.eap.EAP.EAPMethodID getEAPMethodID();
-  }
-
-  public class NonEAPInnerAuth implements android.net.wifi.anqp.eap.AuthParam {
-    ctor public NonEAPInnerAuth(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.eap.EAP.AuthInfoID getAuthInfoID();
-    method public android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType getType();
-  }
-
-  public static final class NonEAPInnerAuth.NonEAPType extends java.lang.Enum {
-    method public static android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType valueOf(java.lang.String);
-    method public static final android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType[] values();
-    enum_constant public static final android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType CHAP;
-    enum_constant public static final android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType MSCHAP;
-    enum_constant public static final android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType MSCHAPv2;
-    enum_constant public static final android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType PAP;
-    enum_constant public static final android.net.wifi.anqp.eap.NonEAPInnerAuth.NonEAPType Reserved;
-  }
-
-  public class VendorSpecificAuth implements android.net.wifi.anqp.eap.AuthParam {
-    ctor public VendorSpecificAuth(java.nio.ByteBuffer) throws java.net.ProtocolException;
-    method public android.net.wifi.anqp.eap.EAP.AuthInfoID getAuthInfoID();
-    method public byte[] getData();
-  }
-
-}
-
-package android.net.wifi.hotspot2 {
-
-  public class ANQPData {
-    ctor public ANQPData(java.util.List<android.net.wifi.anqp.ANQPElement>);
-    method public java.util.List<android.net.wifi.anqp.ANQPElement> getANQPElements();
-  }
-
-  public class NetworkInfo {
-    ctor public NetworkInfo(java.lang.String, java.lang.String, long, android.net.wifi.hotspot2.NetworkInfo.Ant, boolean, android.net.wifi.anqp.VenueNameElement.VenueGroup, android.net.wifi.anqp.VenueNameElement.VenueType, android.net.wifi.hotspot2.NetworkInfo.HSRelease, int, long[]);
-    method public int getAnqpDomainID();
-    method public android.net.wifi.hotspot2.NetworkInfo.Ant getAnt();
-    method public long getBSSID();
-    method public java.lang.String getHESSID();
-    method public android.net.wifi.hotspot2.NetworkInfo.HSRelease getHSRelease();
-    method public long[] getRoamingConsortiums();
-    method public java.lang.String getSSID();
-    method public android.net.wifi.anqp.VenueNameElement.VenueGroup getVenueGroup();
-    method public android.net.wifi.anqp.VenueNameElement.VenueType getVenueType();
-    method public boolean isInternet();
-  }
-
-  public static final class NetworkInfo.Ant extends java.lang.Enum {
-    method public static android.net.wifi.hotspot2.NetworkInfo.Ant valueOf(java.lang.String);
-    method public static final android.net.wifi.hotspot2.NetworkInfo.Ant[] values();
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant ChargeablePublic;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant EmergencyOnly;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant FreePublic;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant Personal;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant Private;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant PrivateWithGuest;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant TestOrExperimental;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.Ant Wildcard;
-  }
-
-  public static final class NetworkInfo.HSRelease extends java.lang.Enum {
-    method public static android.net.wifi.hotspot2.NetworkInfo.HSRelease valueOf(java.lang.String);
-    method public static final android.net.wifi.hotspot2.NetworkInfo.HSRelease[] values();
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.HSRelease R1;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.HSRelease R2;
-    enum_constant public static final android.net.wifi.hotspot2.NetworkInfo.HSRelease Unknown;
-  }
-
-  public class NetworkKey {
-    ctor public NetworkKey(java.lang.String, long, int);
-    method public int getANQPDomainID();
-    method public long getBSSID();
-    method public java.lang.String getSSID();
-  }
-
-  public final class PasspointMatch extends java.lang.Enum {
-    method public static android.net.wifi.hotspot2.PasspointMatch valueOf(java.lang.String);
-    method public static final android.net.wifi.hotspot2.PasspointMatch[] values();
-    enum_constant public static final android.net.wifi.hotspot2.PasspointMatch Declined;
-    enum_constant public static final android.net.wifi.hotspot2.PasspointMatch HomeProvider;
-    enum_constant public static final android.net.wifi.hotspot2.PasspointMatch Incomplete;
-    enum_constant public static final android.net.wifi.hotspot2.PasspointMatch None;
-    enum_constant public static final android.net.wifi.hotspot2.PasspointMatch RoamingProvider;
-  }
-
-  public class SelectionManager {
-    ctor public SelectionManager(java.util.List<android.net.wifi.hotspot2.pps.HomeSP>);
-    method public android.net.wifi.hotspot2.NetworkInfo findNetwork(android.net.wifi.hotspot2.NetworkInfo);
-    method public void notifyANQPResponse(android.net.wifi.hotspot2.NetworkInfo, java.util.List<android.net.wifi.anqp.ANQPElement>);
-  }
-
-}
-
-package android.net.wifi.hotspot2.pps {
-
-  public class DomainMatcher {
-    ctor public DomainMatcher(java.util.List<java.lang.String>, java.util.List<java.util.List<java.lang.String>>);
-    method public android.net.wifi.hotspot2.pps.DomainMatcher.Match isSubDomain(java.util.List<java.lang.String>);
-  }
-
-  public static final class DomainMatcher.Match extends java.lang.Enum {
-    method public static android.net.wifi.hotspot2.pps.DomainMatcher.Match valueOf(java.lang.String);
-    method public static final android.net.wifi.hotspot2.pps.DomainMatcher.Match[] values();
-    enum_constant public static final android.net.wifi.hotspot2.pps.DomainMatcher.Match None;
-    enum_constant public static final android.net.wifi.hotspot2.pps.DomainMatcher.Match Primary;
-    enum_constant public static final android.net.wifi.hotspot2.pps.DomainMatcher.Match Secondary;
-  }
-
-  public class HomeSP {
-    ctor public HomeSP(java.util.Map<java.lang.String, java.lang.String>, java.lang.String, java.util.Set<java.lang.Long>, java.util.Set<java.lang.String>, java.util.Set<java.lang.Long>, java.util.List<java.lang.Long>, java.lang.String, java.lang.String, java.util.Map<android.net.wifi.anqp.eap.EAP.EAPMethodID, android.net.wifi.anqp.eap.EAPMethod>);
-    method public android.net.wifi.hotspot2.PasspointMatch match(android.net.wifi.hotspot2.NetworkInfo, java.util.List<android.net.wifi.anqp.ANQPElement>);
-  }
-
-}
-
 package android.net.wifi.p2p {
 
   public class WifiP2pConfig implements android.os.Parcelable {