Merge "QuickBoot: don't wake up screen when usb connected" into kitkat
Merge "framework/base: Handle P2P-REMOVE-AND-REFORM-GROUP event" into kitkat
QuickBoot: don't wake up screen when usb connected

Don't wake up screen in QuickBoot mode when usb connected.

Change-Id: If65936a0edbbc3b36a0768294e5c3bd7d741018a
framework/base: Handle P2P-REMOVE-AND-REFORM-GROUP event

Remove P2P group on receipt of P2P-REMOVE-AND-REFORM-GROUP event from
wpa supplicant and then reform new P2P group if autonomous group is
set to true.

Change-Id: Id6fbf2c2ebbebc06afc70cf56a7b434eb8ab2eea
CRs-fixed: 531882
wlan: Fix to handle the failure status on supplicant start.

WiFiController shall enter in to StaEnabledState state after the
request to start supplicant irrespective of status being success
or failure.Thus,any new attempts to turn on Wi-Fi later shall
fail as the controller statemachine is expected to be in
APStaDisabledState to start Wi-Fi.
Thus , start the supplicant on a command CMD_WIFI_TOGGLED in the
StaEnabledState if the current WiFi state is neither
WIFI_STATE_ENABLING nor WIFI_STATE_ENABLED.

Change-Id: If4c4913b608411bac334f9c201441aaf36d7675b
CRs-Fixed: 570305
Merge "wlan: Fix to handle the failure status on supplicant start." into kitkat