Merge "Fix device list update" into jb-mr1-dev

isheriff · Android (Google) Code Review · commit 799553e02aa3 · 2012-09-10T00:36:17.000-07:00
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
@@ -125,7 +125,7 @@ public class WifiP2pDevice implements Parcelable {
         "config_methods=(0x[0-9a-fA-F]+) " +
         "dev_capab=(0x[0-9a-fA-F]+) " +
         "group_capab=(0x[0-9a-fA-F]+)" +
-        "( wfd_dev_info=000006([0-9a-fA-F]+))?"
+        "( wfd_dev_info=0x000006([0-9a-fA-F]{12}))?"
     );
 
     /** 2 token device address pattern
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java
@@ -76,6 +76,7 @@ public void update(WifiP2pDevice device) {
             d.wpsConfigMethodsSupported = device.wpsConfigMethodsSupported;
             d.deviceCapability = device.deviceCapability;
             d.groupCapability = device.groupCapability;
+            d.wfdInfo = device.wfdInfo;
             return;
         }
         //Not found, add a new one

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public void update(WifiP2pDevice device) {`
`76`	`76`	`d.wpsConfigMethodsSupported = device.wpsConfigMethodsSupported;`
`77`	`77`	`d.deviceCapability = device.deviceCapability;`
`78`	`78`	`d.groupCapability = device.groupCapability;`
	`79`	`+ d.wfdInfo = device.wfdInfo;`
`79`	`80`	`return;`
`80`	`81`	`}`
`81`	`82`	`//Not found, add a new one`