diff options
| author | Jan Nordqvist <jannq@google.com> | 2016-01-23 18:39:18 -0800 |
|---|---|---|
| committer | Jan Nordqvist <jannq@google.com> | 2016-02-03 11:28:45 -0800 |
| commit | 2e814680f4dd27a5f825afab189843582235cedc (patch) | |
| tree | c1cf3a62837a70b7e511e5198bf8953d776bc523 /service/java/com/android/server/wifi/WifiMonitor.java | |
| parent | a51955bb18c047b2d7e4160f75b7e2dc876eb227 (diff) | |
| download | android_frameworks_opt_net_wifi-2e814680f4dd27a5f825afab189843582235cedc.tar.gz android_frameworks_opt_net_wifi-2e814680f4dd27a5f825afab189843582235cedc.tar.bz2 android_frameworks_opt_net_wifi-2e814680f4dd27a5f825afab189843582235cedc.zip | |
New System APIs for Passpoint r2 app.
Change-Id: If23e6ab432e871a407cbff94292673524c6d72bd
Diffstat (limited to 'service/java/com/android/server/wifi/WifiMonitor.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMonitor.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java index b495a41eb..c44c7c6eb 100644 --- a/service/java/com/android/server/wifi/WifiMonitor.java +++ b/service/java/com/android/server/wifi/WifiMonitor.java @@ -41,6 +41,7 @@ import com.android.server.wifi.p2p.WifiP2pServiceImpl.P2pStatus; import com.android.internal.util.Protocol; import com.android.internal.util.StateMachine; +import java.io.IOException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -510,7 +511,6 @@ public class WifiMonitor { /* hotspot 2.0 events */ public static final int HS20_REMEDIATION_EVENT = BASE + 61; - public static final int HS20_DEAUTH_EVENT = BASE + 62; /** * This indicates a read error on the monitor socket conenction @@ -828,10 +828,10 @@ public class WifiMonitor { } else if (eventStr.startsWith(HS20_SUB_REM_STR)) { // Tack on the last connected BSSID so we have some idea what AP the WNM pertains to - handleWnmRemediationFrame(String.format("%012x %s", + handleWnmFrame(String.format("%012x %s", mLastConnectBSSIDs.get(iface), eventStr), iface); } else if (eventStr.startsWith(HS20_DEAUTH_STR)) { - handleWnmDeauthFrame(String.format("%012x %s", + handleWnmFrame(String.format("%012x %s", mLastConnectBSSIDs.get(iface), eventStr), iface); } else if (eventStr.startsWith(REQUEST_PREFIX_STR)) { handleRequests(eventStr, iface); @@ -1276,12 +1276,13 @@ public class WifiMonitor { } } - private void handleWnmRemediationFrame(String eventStr, String iface) { - sendMessage(iface, HS20_REMEDIATION_EVENT, eventStr); - } - - private void handleWnmDeauthFrame(String eventStr, String iface) { - sendMessage(iface, HS20_DEAUTH_EVENT, eventStr); + private void handleWnmFrame(String eventStr, String iface) { + try { + WnmData wnmData = WnmData.buildWnmData(eventStr); + sendMessage(iface, HS20_REMEDIATION_EVENT, wnmData); + } catch (IOException | NumberFormatException e) { + Log.w(TAG, "Bad WNM event: '" + eventStr + "'"); + } } /** |