summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiMetrics.java6
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java4
2 files changed, 9 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index 992182686..f899ac105 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -281,6 +281,8 @@ public class WifiMetrics {
public static final int FAILURE_ROAM_TIMEOUT = 9;
// DHCP failure
public static final int FAILURE_DHCP = 10;
+ // ASSOCIATION_TIMED_OUT
+ public static final int FAILURE_ASSOCIATION_TIMED_OUT = 11;
RouterFingerPrint mRouterFingerPrint;
private long mRealStartTime;
@@ -369,6 +371,10 @@ public class WifiMetrics {
break;
case FAILURE_DHCP:
sb.append("DHCP");
+ break;
+ case FAILURE_ASSOCIATION_TIMED_OUT:
+ sb.append("ASSOCIATION_TIMED_OUT");
+ break;
default:
sb.append("UNKNOWN");
break;
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 38c2cd428..4bcb8d2e1 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4305,7 +4305,9 @@ public class WifiStateMachine extends StateMachine {
mSupplicantStateTracker.sendMessage(WifiMonitor.ASSOCIATION_REJECTION_EVENT);
// If rejection occurred while Metrics is tracking a ConnnectionEvent, end it.
reportConnectionAttemptEnd(
- WifiMetrics.ConnectionEvent.FAILURE_ASSOCIATION_REJECTION,
+ timedOut
+ ? WifiMetrics.ConnectionEvent.FAILURE_ASSOCIATION_TIMED_OUT
+ : WifiMetrics.ConnectionEvent.FAILURE_ASSOCIATION_REJECTION,
WifiMetricsProto.ConnectionEvent.HLF_NONE);
mWifiInjector.getWifiLastResortWatchdog()
.noteConnectionFailureAndTriggerIfNeeded(