From b2e6bfd0f0fc675b253ce081d97ca192422a7495 Mon Sep 17 00:00:00 2001
From: Andres Morales <anmorales@google.com>
Date: Thu, 16 Jan 2014 15:17:02 -0800
Subject: [PATCH] Add calls for NFC WSC token creation

Expose interface for generating Wifi Simple
Configuration tokens from supplicant.

Change-Id: Ie310a32f529c0330340e045aee561dc434aeee3e
---
 wifi/java/android/net/wifi/IWifiManager.aidl |  2 ++
 wifi/java/android/net/wifi/WifiManager.java  | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 4a6b1ffc71b2a..0b67c97b9ee8b 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -124,5 +124,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 aabe0075293c4..42cbaae4db9ba 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -877,6 +877,21 @@ public class WifiManager {
         } catch (RemoteException e) { }
     }
 
+    /**
+     * 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}.