summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-04-18 22:16:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-18 22:16:05 +0000
commita454c5732cacffdda53ae277b1e43d87b43044b1 (patch)
tree93dab73490a872185d0762701e477f2c183e53ce /services
parentd2fe47fcbe329ada690e8e66d8d359813597c459 (diff)
parentf110a3701b8d7ac435c5bb65df4dd9d758be1762 (diff)
downloadframeworks_base-a454c5732cacffdda53ae277b1e43d87b43044b1.zip
frameworks_base-a454c5732cacffdda53ae277b1e43d87b43044b1.tar.gz
frameworks_base-a454c5732cacffdda53ae277b1e43d87b43044b1.tar.bz2
Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/display/WifiDisplayController.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java
index a83675e..8c8b360 100644
--- a/services/java/com/android/server/display/WifiDisplayController.java
+++ b/services/java/com/android/server/display/WifiDisplayController.java
@@ -481,6 +481,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
mRemoteDisplayConnected = false;
mHandler.removeCallbacks(mRtspTimeout);
+ mWifiP2pManager.setMiracastMode(WifiP2pManager.MIRACAST_DISABLED);
setRemoteSubmixOn(false);
unadvertiseDisplay();
@@ -626,6 +627,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
}
setRemoteSubmixOn(true);
+ mWifiP2pManager.setMiracastMode(WifiP2pManager.MIRACAST_SOURCE);
final WifiP2pDevice oldDevice = mConnectedDevice;
final int port = getPortNumber(mConnectedDevice);