diff options
| author | Andres Morales <anmorales@google.com> | 2014-04-04 16:42:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 16:42:37 +0000 |
| commit | 2517be5b72904ddaee27eb1243fdc5dc4782ebf5 (patch) | |
| tree | 8d5185101fa29864802dd7e2de0f375a857a642c /wifi/java/android/net/wifi | |
| parent | b951af64ebd25baac5e40901ec7fa3f2b44a4cb1 (diff) | |
| parent | b2e6bfd0f0fc675b253ce081d97ca192422a7495 (diff) | |
| download | frameworks_base-2517be5b72904ddaee27eb1243fdc5dc4782ebf5.zip frameworks_base-2517be5b72904ddaee27eb1243fdc5dc4782ebf5.tar.gz frameworks_base-2517be5b72904ddaee27eb1243fdc5dc4782ebf5.tar.bz2 | |
Merge "Add calls for NFC WSC token creation"
Diffstat (limited to 'wifi/java/android/net/wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 84e933d..0535fe0 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -128,5 +128,7 @@ interface IWifiManager boolean isBatchedScanSupported(); void pollBatchedScan(); + + String getWpsNfcConfigurationToken(int netId); } diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 0862b7e..5af1e4e 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -930,6 +930,21 @@ public class WifiManager { } /** + * Creates a configuration token describing the network referenced by {@code netId} + * of MIME type application/vnd.wfa.wsc. Can be used to configure WiFi networks via NFC. + * + * @return hex-string encoded configuration token + * @hide + */ + public String getWpsNfcConfigurationToken(int netId) { + try { + return mService.getWpsNfcConfigurationToken(netId); + } catch (RemoteException e) { + return null; + } + } + + /** * Return dynamic information about the current Wi-Fi connection, if any is active. * @return the Wi-Fi information, contained in {@link WifiInfo}. */ |