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

Update WifiP2pWfdDevInfo from device found event

Browse Source 
Change-Id: I197e84e16147d3db7362e3d6d169ff917c112de2
This commit is contained in:
Irfan Sheriff
2012-09-09 17:10:47 -07:00
parent 4db5d23dea
commit 1f6d870691
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
View File

@@ -124,7 +124,8 @@ public class WifiP2pDevice implements Parcelable {
"name='(.*)' " +
"config_methods=(0x[0-9a-fA-F]+) " +
"dev_capab=(0x[0-9a-fA-F]+) " +
"group_capab=(0x[0-9a-fA-F]+)"
"group_capab=(0x[0-9a-fA-F]+)" +
"( wfd_dev_info=000006([0-9a-fA-F]+))?"
);
/** 2 token device address pattern
@@ -153,7 +154,7 @@ public class WifiP2pDevice implements Parcelable {
* @param string formats supported include
* P2P-DEVICE-FOUND fa:7b:7a:42:02:13 p2p_dev_addr=fa:7b:7a:42:02:13
* pri_dev_type=1-0050F204-1 name='p2p-TEST1' config_methods=0x188 dev_capab=0x27
* group_capab=0x0
* group_capab=0x0 wfd_dev_info=000006015d022a0032
*
* P2P-DEVICE-LOST p2p_dev_addr=fa:7b:7a:42:02:13
*
@@ -205,6 +206,12 @@ public class WifiP2pDevice implements Parcelable {
wpsConfigMethodsSupported = parseHex(match.group(6));
deviceCapability = parseHex(match.group(7));
groupCapability = parseHex(match.group(8));
if (match.group(9) != null) {
String str = match.group(10);
wfdInfo = new WifiP2pWfdInfo(parseHex(str.substring(0,4)),
parseHex(str.substring(4,8)),
parseHex(str.substring(8,12)));
}
break;
}

7
wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java
View File

@@ -54,6 +54,13 @@ public class WifiP2pWfdInfo implements Parcelable {
public WifiP2pWfdInfo() {
}
public WifiP2pWfdInfo(int devInfo, int ctrlPort, int maxTput) {
mWfdEnabled = true;
mDeviceInfo = devInfo;
mCtrlPort = ctrlPort;
mMaxThroughput = maxTput;
}
public boolean isWfdEnabled() {
return mWfdEnabled;
}