We now show a dialog to user and let him handle whether to choose wifi or p2p when there is a frequency conflict. If user chooses to disable wifi tempoarily, we disconnect wifi until p2p connection is established and removed. Bug: 6590401 Change-Id: I73871ddcb3732ae61997d8771b6aa90ad56270af