am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process"

* commit '46e380795216c58acbd38af532ac1626e105866a':
  Prevent scanning during DHCP process

wifi/java/android/net/wifi/WifiStateMachine.java

@@ -3366,6 +3366,10 @@ public class WifiStateMachine extends StateMachine {
               case CMD_SET_HIGH_PERF_MODE:
                   deferMessage(message);
                   break;
+                  /* Defer scan request since we should not switch to other channels at DHCP */
+              case CMD_START_SCAN:
+                  deferMessage(message);
+                  break;
               default:
                   return NOT_HANDLED;
           }