summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-05-11 09:54:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-11 09:54:45 -0700
commit77a0c9d7bc664ac9b367da082fd5134b4ae653fe (patch)
tree4b4f8ddc8228ab3369c295444203e151e48005fa /wifi
parentea47c0bd945502907a5c251fe5c8864d63884588 (diff)
parentb4fd1bd7748d2df00ec0792d3419aa79c742f979 (diff)
downloadframeworks_base-77a0c9d7bc664ac9b367da082fd5134b4ae653fe.zip
frameworks_base-77a0c9d7bc664ac9b367da082fd5134b4ae653fe.tar.gz
frameworks_base-77a0c9d7bc664ac9b367da082fd5134b4ae653fe.tar.bz2
am b4fd1bd7: am de1361fa: Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev
* commit 'b4fd1bd7748d2df00ec0792d3419aa79c742f979': P2P: Turn OFF PS-mode for DHCP session
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/p2p/WifiP2pService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
index 0f7c84f..4cfc4ac 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -1361,6 +1361,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);
mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine(mContext,
P2pStateMachine.this, mGroup.getInterface());
+ // TODO: We should use DHCP state machine PRE message like WifiStateMachine
+ mWifiNative.setP2pPowerSave(mGroup.getInterface(), false);
mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP);
WifiP2pDevice groupOwner = mGroup.getOwner();
WifiP2pDevice peer = mPeers.get(groupOwner.deviceAddress);