summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorYuhao Zheng <yuhaozheng@google.com>2014-05-13 09:40:27 -0700
committerVinit Deshpande <vinitd@google.com>2014-05-18 09:41:35 -0700
commit0c78205e664e679c4bf9543e17372879d5010611 (patch)
tree6041627444b28051aefbb578bd67c5b5c2e9d508 /api
parenta4864472313208e4f1de02f45d3eadad237c54af (diff)
downloadframeworks_base-0c78205e664e679c4bf9543e17372879d5010611.zip
frameworks_base-0c78205e664e679c4bf9543e17372879d5010611.tar.gz
frameworks_base-0c78205e664e679c4bf9543e17372879d5010611.tar.bz2
Hotspot 2.0 framework API -- more functionalities
- Added resolution parameter for requestOsuIcons() - Added ANQP parser (OSU provider list only) Bug: 5485670 Change-Id: I69f6fd2ce6f80980ad786c2a3833cca8279771b3
Diffstat (limited to 'api')
-rw-r--r--api/current.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index ce84e6e..b5eeb68 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17162,12 +17162,13 @@ package android.net.wifi.passpoint {
public class PasspointManager {
ctor public PasspointManager(android.content.Context, android.net.wifi.passpoint.IPasspointManager);
method public boolean addCredential(android.net.wifi.passpoint.PasspointCredential);
- method public boolean connect(android.net.wifi.passpoint.PasspointPolicy);
+ method public void connect(android.net.wifi.passpoint.PasspointPolicy);
method public int getPasspointState();
method public java.util.List<android.net.wifi.passpoint.PasspointCredential> getSavedCredentials();
method public android.net.wifi.passpoint.PasspointManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.passpoint.PasspointManager.ChannelListener);
method public boolean removeCredential(android.net.wifi.passpoint.PasspointCredential);
- method public void requestOsuIcons(android.net.wifi.passpoint.PasspointManager.Channel, java.util.List<android.net.wifi.passpoint.PasspointOsuProvider>, android.net.wifi.passpoint.PasspointManager.ActionListener);
+ method public java.util.List<android.net.wifi.passpoint.PasspointPolicy> requestCredentialMatch(java.util.List<android.net.wifi.ScanResult>);
+ method public void requestOsuIcons(android.net.wifi.passpoint.PasspointManager.Channel, java.util.List<android.net.wifi.passpoint.PasspointOsuProvider>, int, android.net.wifi.passpoint.PasspointManager.ActionListener);
method public boolean updateCredential(android.net.wifi.passpoint.PasspointCredential);
field public static final int BUSY = 2; // 0x2
field public static final int ERROR = 0; // 0x0
@@ -17199,14 +17200,18 @@ package android.net.wifi.passpoint {
field public static final android.os.Parcelable.Creator CREATOR;
field public static final int OSU_METHOD_OMADM = 0; // 0x0
field public static final int OSU_METHOD_SOAP = 1; // 0x1
- field public java.lang.String SSID;
+ field public static final int OSU_METHOD_UNKNOWN = -1; // 0xffffffff
field public java.lang.String friendlyName;
field public java.lang.Object icon;
field public java.lang.String iconFileName;
+ field public int iconHeight;
+ field public java.lang.String iconType;
+ field public int iconWidth;
field public int osuMethod;
field public java.lang.String osuNai;
field public java.lang.String osuService;
field public java.lang.String serverUri;
+ field public java.lang.String ssid;
}
public class PasspointPolicy implements android.os.Parcelable {