Merge "Update hidden WifiManager API."
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index af48d0a..10ffd8a 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -139,7 +139,7 @@
void enableTdlsWithMacAddress(String remoteMacAddress, boolean enable);
- String getWpsNfcConfigurationToken(int netId);
+ String getCurrentNetworkWpsNfcConfigurationToken();
void enableVerboseLogging(int verbose);
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 824c436..ae6a679 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1437,15 +1437,15 @@
}
/**
- * 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.
+ * Creates a configuration token describing the current network of MIME type
+ * application/vnd.wfa.wsc. Can be used to configure WiFi networks via NFC.
*
- * @return hex-string encoded configuration token
+ * @return hex-string encoded configuration token or null if there is no current network
* @hide
*/
- public String getWpsNfcConfigurationToken(int netId) {
+ public String getCurrentNetworkWpsNfcConfigurationToken() {
try {
- return mService.getWpsNfcConfigurationToken(netId);
+ return mService.getCurrentNetworkWpsNfcConfigurationToken();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}