am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev

* commit 'a454c5732cacffdda53ae277b1e43d87b43044b1':
  Sent hint to Wifi driver when enabling WFD.
This commit is contained in:
Jeff Brown
2013-04-18 15:17:53 -07:00
committed by Android Git Automerger

View File

@@ -481,6 +481,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
mRemoteDisplayConnected = false; mRemoteDisplayConnected = false;
mHandler.removeCallbacks(mRtspTimeout); mHandler.removeCallbacks(mRtspTimeout);
mWifiP2pManager.setMiracastMode(WifiP2pManager.MIRACAST_DISABLED);
setRemoteSubmixOn(false); setRemoteSubmixOn(false);
unadvertiseDisplay(); unadvertiseDisplay();
@@ -626,6 +627,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
} }
setRemoteSubmixOn(true); setRemoteSubmixOn(true);
mWifiP2pManager.setMiracastMode(WifiP2pManager.MIRACAST_SOURCE);
final WifiP2pDevice oldDevice = mConnectedDevice; final WifiP2pDevice oldDevice = mConnectedDevice;
final int port = getPortNumber(mConnectedDevice); final int port = getPortNumber(mConnectedDevice);