From e50a607a35669090f9b3174a1e0d7b7869b6fc63 Mon Sep 17 00:00:00 2001 From: Amin Shaikh Date: Thu, 23 Mar 2017 17:59:48 -0700 Subject: Update hidden WifiManager API. - Refactor getWpsNfcConfigurationToken(int) to getCurrentNetworkWpsNfcConfigurationToken() Bug: 35725168 Test: runtest frameworks-wifi Change-Id: Ia362e4d781297d7f89a4437a0c5ae6edecff24e5 --- wifi/java/android/net/wifi/IWifiManager.aidl | 2 +- wifi/java/android/net/wifi/WifiManager.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index af48d0a2b6ca..10ffd8ae1f7d 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -139,7 +139,7 @@ interface IWifiManager 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 824c436ac9fd..ae6a6793dc9d 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1437,15 +1437,15 @@ 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. + * 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(); } -- cgit v1.2.3-59-g8ed1b