diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-04-20 00:49:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-20 00:49:43 +0000 |
| commit | fd9b2a515491854d378dc944cf43ded62475888c (patch) | |
| tree | a8a16c22a647201972379c0c234e2b82e827cf8b /service | |
| parent | 0ec4f8f5e7e6c58189fc9e731da87e00d5340a8d (diff) | |
| parent | 890a724719037f0262ae9e43c468801f3b6537de (diff) | |
Merge "Handle CMD_DISABLE_P2P_WATCHDOG_TIMER in default state" into oc-dev am: 59870df7cf
am: 890a724719
Change-Id: Ia5122b3afad1727e354919cec4b9a4803cb84b12
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; |