diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-04-19 23:48:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-19 23:48:48 +0000 |
| commit | 890a724719037f0262ae9e43c468801f3b6537de (patch) | |
| tree | f1c5bf96d952f46d4f406572784d84ae2604aa19 /service | |
| parent | 88fa7dd65618c1781b8db4206fd0d0aac5614278 (diff) | |
| parent | 59870df7cfc1c2af89e3de31a1ebbb0419f59c0c (diff) | |
Merge "Handle CMD_DISABLE_P2P_WATCHDOG_TIMER in default state" into oc-dev
am: 59870df7cf
Change-Id: Ia247dc69fa96aa838cbe505b7b51de0ca71b380a
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; |