Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WFD fixes" into jb-mr1-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2012-09-18 12:22:06 -07:00
committed by Android (Google) Code Review
parent 00bc4c0b67 e0c28d5f13
commit 24ed276913
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/display/WifiDisplayController.java
View File

@@ -485,6 +485,8 @@ final class WifiDisplayController implements DumpUtils.Dump {
mConnectingDevice = mDesiredDevice;
WifiP2pConfig config = new WifiP2pConfig();
config.deviceAddress = mConnectingDevice.deviceAddress;
// Helps with STA & P2P concurrency
config.groupOwnerIntent = WifiP2pConfig.MAX_GROUP_OWNER_INTENT;
final WifiDisplay display = createWifiDisplay(mConnectingDevice);
mHandler.post(new Runnable() {

3
wifi/java/android/net/wifi/p2p/WifiP2pConfig.java
View File

@@ -37,6 +37,9 @@ public class WifiP2pConfig implements Parcelable {
*/
public WpsInfo wps;
/** @hide */
public static final int MAX_GROUP_OWNER_INTENT = 15;
/**
* This is an integer value between 0 and 15 where 0 indicates the least
* inclination to be a group owner and 15 indicates the highest inclination

9
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@@ -135,7 +135,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
private static final int DISCOVER_TIMEOUT_S = 120;
/* Idle time after a peer is gone when the group is torn down */
private static final int GROUP_IDLE_TIME_S = 5;
private static final int GROUP_IDLE_TIME_S = 20;
private static final int BASE = Protocol.BASE_WIFI_P2P_SERVICE;
@@ -1212,13 +1212,10 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
mGroup.getNetworkName()));
}
mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);
if (mGroup.isGroupOwner()) {
startDhcpServer(mGroup.getInterface());
} else {
// Set group idle only for a client on the group interface to speed up
// disconnect when GO is gone. Setting group idle time for a group owner
// causes connectivity issues for new clients
mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);
mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine(mContext,
P2pStateMachine.this, mGroup.getInterface());
mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP);
@@ -1283,7 +1280,6 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
//DHCP server has already been started if I am a group owner
if (mGroup.isGroupOwner()) {
setWifiP2pInfoOnGroupFormation(SERVER_ADDRESS);
sendP2pConnectionChangedBroadcast();
}
}
@@ -1306,6 +1302,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
} else {
loge("Connect on null device address, ignore");
}
sendP2pConnectionChangedBroadcast();
break;
case WifiMonitor.AP_STA_DISCONNECTED_EVENT:
device = (WifiP2pDevice) message.obj;