diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-04 20:12:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-04 20:12:33 +0000 |
| commit | 3ad2dd15a73e20fde7ad4ae6676c06396c92257a (patch) | |
| tree | 44b7043c65649601820ee766f17b00ccccb3920d /service | |
| parent | f4ec51d3b9d8b4d7f6f9d4b9cf0832293a8cfb14 (diff) | |
| parent | b195838541edf2597659b217291079c52623d85c (diff) | |
Merge "WifiMetrics: Send a different error code for assoc timeout" into pi-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMetrics.java | 6 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 4 |
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 669eff65f..66605971c 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -287,6 +287,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; @@ -375,6 +377,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 e2345e9b1..41371c6e1 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( |