diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-24 23:48:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-24 23:48:13 +0000 |
| commit | 8e553c9bd76a950247ad7d209827644237d2fcb6 (patch) | |
| tree | 22284c24eed0bbf5bdca652d2cae0def800dd7df | |
| parent | 4935869481fa6f33fd99e522b8d8d6bed01cc2aa (diff) | |
| parent | ba3f5bc64ef27f2ec0d3eae3f53c633ea9e66268 (diff) | |
| download | android_frameworks_opt_net_wifi-8e553c9bd76a950247ad7d209827644237d2fcb6.tar.gz android_frameworks_opt_net_wifi-8e553c9bd76a950247ad7d209827644237d2fcb6.tar.bz2 android_frameworks_opt_net_wifi-8e553c9bd76a950247ad7d209827644237d2fcb6.zip | |
Merge "Update WPS NFC token retrieval."
3 files changed, 7 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index 68da5fbc4..fae1cc939 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -775,7 +775,7 @@ public class WifiNative { * * @return Hex string corresponding to the WPS NFC token. */ - public String getNfcWpsConfigurationToken(int netId) { + public String getCurrentNetworkWpsNfcConfigurationToken() { return mSupplicantStaIfaceHal.getCurrentNetworkWpsNfcConfigurationToken(); } /******************************************************** diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 303af02db..9dd496624 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -515,11 +515,12 @@ public class WifiServiceImpl extends IWifiManager.Stub { } @Override - public String getWpsNfcConfigurationToken(int netId) { + public String getCurrentNetworkWpsNfcConfigurationToken() { enforceConnectivityInternalPermission(); - mLog.trace("getWpsNfcConfigurationToken uid=%").c(Binder.getCallingUid()).flush(); + mLog.trace("getCurrentNetworkWpsNfcConfigurationToken uid=%") + .c(Binder.getCallingUid()).flush(); // TODO Add private logging for netId b/33807876 - return mWifiStateMachine.syncGetWpsNfcConfigurationToken(netId); + return mWifiStateMachine.syncGetCurrentNetworkWpsNfcConfigurationToken(); } boolean mInIdleMode; diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 898a9ca76..e061fe4da 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1976,8 +1976,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss * * @return a hex string representation of the WPS-NFC configuration token */ - public String syncGetWpsNfcConfigurationToken(int netId) { - return mWifiNative.getNfcWpsConfigurationToken(netId); + public String syncGetCurrentNetworkWpsNfcConfigurationToken() { + return mWifiNative.getCurrentNetworkWpsNfcConfigurationToken(); } public void enableRssiPolling(boolean enabled) { |