diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-19 23:16:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-19 23:16:26 +0000 |
| commit | 59870df7cfc1c2af89e3de31a1ebbb0419f59c0c (patch) | |
| tree | d33e0de399c5721ffc2dd706b1b0eb9ad9f44fec /service | |
| parent | 3871ff67f4a6970f1831fc8951392746c9e2bfa2 (diff) | |
| parent | b9da2489b01de340779718265a39212007a6554f (diff) | |
Merge "Handle CMD_DISABLE_P2P_WATCHDOG_TIMER in default state" into oc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 707127fbb..d90962157 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -3789,6 +3789,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss case CMD_UNWANTED_NETWORK: case CMD_DISCONNECTING_WATCHDOG_TIMER: case CMD_ROAM_WATCHDOG_TIMER: + case CMD_DISABLE_P2P_WATCHDOG_TIMER: case CMD_DISABLE_EPHEMERAL_NETWORK: messageHandlingStatus = MESSAGE_HANDLING_STATUS_DISCARD; break; |