diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-09-10 00:36:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 00:36:17 -0700 |
| commit | 799553e02aa3350397d723982d42198a5bab774c (patch) | |
| tree | e2b0978b1ad38fcf05fabf3e17bb0608fe8040f0 /wifi | |
| parent | 41bd89f6b61296492d3775e5ef30e94c5f18d34f (diff) | |
| parent | e298d884580006cbcd4aec8fd7877dae3f081eec (diff) | |
| download | frameworks_base-799553e02aa3350397d723982d42198a5bab774c.zip frameworks_base-799553e02aa3350397d723982d42198a5bab774c.tar.gz frameworks_base-799553e02aa3350397d723982d42198a5bab774c.tar.bz2 | |
Merge "Fix device list update" into jb-mr1-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pDevice.java | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java index 0228d1b..863a055 100644 --- 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 index 157dc50..2093bda 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java @@ -76,6 +76,7 @@ public class WifiP2pDeviceList implements Parcelable { d.wpsConfigMethodsSupported = device.wpsConfigMethodsSupported; d.deviceCapability = device.deviceCapability; d.groupCapability = device.groupCapability; + d.wfdInfo = device.wfdInfo; return; } //Not found, add a new one |