diff options
author | Paul Stewart <pstew@google.com> | 2016-03-15 18:52:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-15 18:52:53 +0000 |
commit | e6ee3780bad3664ce5d2c61f9a4e76a5daae1a7d (patch) | |
tree | d8e7b1e3617fb05320fb770036d355c570a9dfec | |
parent | d8cb19d3c7835afc76149ddeb91a74cf49e8f1ef (diff) | |
parent | b740903bec94d63f89904ec9561085f9ca6c453a (diff) |
Merge "WifiStateMachine: Defer CMD_RESET_SIM_NETWORKS by default" into nyc-dev
-rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 90539dfcc..61f660039 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5106,6 +5106,11 @@ public class WifiStateMachine extends StateMachine implements WifiNative.PnoEven */ replyToMessage(message, message.what); break; + case CMD_RESET_SIM_NETWORKS: + /* Defer this message until supplicant is started. */ + messageHandlingStatus = MESSAGE_HANDLING_STATUS_DEFERRED; + deferMessage(message); + break; default: loge("Error! unhandled message" + message); break; |