diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-08 02:49:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-08 02:49:26 +0000 |
| commit | 412585c19416b8574fc98a10be44b4ff6e7d86fd (patch) | |
| tree | 900340eb790ac872c93bfa9e07e7419288f5d957 /service | |
| parent | 58374056df4e1a862e4b4be92912d3c762bd90fe (diff) | |
| parent | 6680c62f91f61660d47c34ae435113ca5846b79d (diff) | |
Merge "SupplicantStaIfaceHal: Add timedOut param in assoc reject"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/SupplicantStaIfaceHal.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMonitor.java | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java index a6df07fa5..8c41441c3 100644 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java @@ -1825,12 +1825,12 @@ public class SupplicantStaIfaceHal { } @Override - public void onAssociationRejected(byte[/* 6 */] bssid, int statusCode) { + public void onAssociationRejected(byte[/* 6 */] bssid, int statusCode, boolean timedOut) { logCallback("onAssociationRejected"); synchronized (mLock) { // TODO(b/35464954): Need to figure out when to trigger // |WifiMonitor.AUTHENTICATION_FAILURE_REASON_WRONG_PSWD| - mWifiMonitor.broadcastAssociationRejectionEvent(mIfaceName, statusCode, + mWifiMonitor.broadcastAssociationRejectionEvent(mIfaceName, statusCode, timedOut, NativeUtil.macAddressFromByteArray(bssid)); } } diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java index 23249a7b6..c0afc060e 100644 --- a/service/java/com/android/server/wifi/WifiMonitor.java +++ b/service/java/com/android/server/wifi/WifiMonitor.java @@ -1041,7 +1041,7 @@ public class WifiMonitor { status = -1; } } - broadcastAssociationRejectionEvent(iface, status, BSSID); + broadcastAssociationRejectionEvent(iface, status, false, BSSID); } else if (event == BSS_ADDED && !DBG) { // Ignore that event - it is not handled, and dont log it as it is too verbose } else if (event == BSS_REMOVED && !DBG) { @@ -1669,10 +1669,12 @@ public class WifiMonitor { * * @param iface Name of iface on which this occurred. * @param status Status code for association rejection. + * @param timedOut Indicates if the association timed out. * @param bssid BSSID of the access point from which we received the reject. */ - public void broadcastAssociationRejectionEvent(String iface, int status, String bssid) { - sendMessage(iface, ASSOCIATION_REJECTION_EVENT, 0, status, bssid); + public void broadcastAssociationRejectionEvent(String iface, int status, boolean timedOut, + String bssid) { + sendMessage(iface, ASSOCIATION_REJECTION_EVENT, timedOut ? 1 : 0, status, bssid); } /** |