commit 0b1cd628e686e7b85acaaeabf1a0bef74ed2b298
author Vinit Deshpande <vinitd@google.com> Fri May 01 11:45:53 2015 -0700
committer The Android Automerger <android-build@google.com> Fri May 01 13:34:31 2015 -0700
tree 929e8b6d836bde8d6700670bbc492e61b592b12f
parent 0d5b0fbcbe2d48244b3e09a949c22b904ad28388

Fix unhandled CMD_GET_MATCHING_CONFIG

This causes ANRs, since the request may not get completed
in certain cases (such as scan only mode).

Bug: 20747903
Change-Id: I40388c16bed7d14386c1c3808ceaccb850ad2a13

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 03abb84..d961faa 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -5260,7 +5260,6 @@
                 case CMD_DISCONNECTING_WATCHDOG_TIMER:
                 case CMD_ROAM_WATCHDOG_TIMER:
                 case CMD_DISABLE_EPHEMERAL_NETWORK:
-                case CMD_GET_MATCHING_CONFIG:
                     messageHandlingStatus = MESSAGE_HANDLING_STATUS_DISCARD;
                     break;
                 case DhcpStateMachine.CMD_ON_QUIT:
@@ -5319,6 +5318,9 @@
                     // Not supported hence reply with error message
                     replyToMessage(message, message.what, null);
                     break;
+                case CMD_GET_MATCHING_CONFIG:
+                    replyToMessage(message, message.what);
+                    break;
                 case WifiP2pServiceImpl.P2P_CONNECTION_CHANGED:
                     NetworkInfo info = (NetworkInfo) message.obj;
                     mP2pConnected.set(info.isConnected());
@@ -6368,6 +6370,9 @@
             case CMD_GET_LINK_LAYER_STATS:
                 s = "CMD_GET_LINK_LAYER_STATS";
                 break;
+            case CMD_GET_MATCHING_CONFIG:
+                s = "CMD_GET_MATCHING_CONFIG";
+                break;
             case CMD_GET_PRIVILEGED_CONFIGURED_NETWORKS:
                 s = "CMD_GET_PRIVILEGED_CONFIGURED_NETWORKS";
                 break;