diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 24 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 26 |
2 files changed, 25 insertions, 25 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 7f0484de3..a821e61c0 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2575,30 +2575,6 @@ public class WifiConfigManager { } - public void wnmFrameReceived(WnmData event) { - // %012x HS20-SUBSCRIPTION-REMEDIATION "%u %s", osu_method, url - // %012x HS20-DEAUTH-IMMINENT-NOTICE "%u %u %s", code, reauth_delay, url - - Intent intent = new Intent(WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION); - intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); - - intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_BSSID, event.getBssid()); - intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_URL, event.getUrl()); - - if (event.isDeauthEvent()) { - intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_ESS, event.isEss()); - intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_DELAY, event.getDelay()); - } else { - intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_METHOD, event.getMethod()); - WifiConfiguration config = mWifiStateMachine.getCurrentWifiConfiguration(); - if (config != null && config.FQDN != null) { - intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_PPOINT_MATCH, - matchProviderWithCurrentNetwork(config.FQDN)); - } - } - mContext.sendBroadcastAsUser(intent, UserHandle.ALL); - } - private void updateAnqpCache(ScanDetail scanDetail, Map<Constants.ANQPElementType, ANQPElement> anqpElements) { NetworkDetail networkDetail = scanDetail.getNetworkDetail(); diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 3b50c1bf8..bb248a225 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5139,7 +5139,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss mWifiConfigManager.notifyIconReceived((IconEvent) message.obj); break; case WifiMonitor.HS20_REMEDIATION_EVENT: - mWifiConfigManager.wnmFrameReceived((WnmData) message.obj); + wnmFrameReceived((WnmData) message.obj); break; case CMD_CONFIG_ND_OFFLOAD: final boolean enabled = (message.arg1 > 0); @@ -8622,4 +8622,28 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss return TextUtils.join(" ", attributes); } + + private void wnmFrameReceived(WnmData event) { + // %012x HS20-SUBSCRIPTION-REMEDIATION "%u %s", osu_method, url + // %012x HS20-DEAUTH-IMMINENT-NOTICE "%u %u %s", code, reauth_delay, url + + Intent intent = new Intent(WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION); + intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); + + intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_BSSID, event.getBssid()); + intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_URL, event.getUrl()); + + if (event.isDeauthEvent()) { + intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_ESS, event.isEss()); + intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_DELAY, event.getDelay()); + } else { + intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_METHOD, event.getMethod()); + WifiConfiguration config = getCurrentWifiConfiguration(); + if (config != null && config.FQDN != null) { + intent.putExtra(WifiManager.EXTRA_PASSPOINT_WNM_PPOINT_MATCH, + mWifiConfigManager.matchProviderWithCurrentNetwork(config.FQDN)); + } + } + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + } } |