summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/p2p
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-12-11 23:18:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-11 23:18:26 +0000
commitf7a38a09ff4d7b3cf7f2e975e18562335e0cbcf3 (patch)
tree55dbb0f4eb3b2f9ac878b3606bfe913054664113 /wifi/java/android/net/wifi/p2p
parent87b25acffbcaa6df9da14a0eb9ff595b1bf85109 (diff)
parent3af71e6dcf078ad50c9d074e08b5b04311971f35 (diff)
downloadframeworks_base-f7a38a09ff4d7b3cf7f2e975e18562335e0cbcf3.zip
frameworks_base-f7a38a09ff4d7b3cf7f2e975e18562335e0cbcf3.tar.gz
frameworks_base-f7a38a09ff4d7b3cf7f2e975e18562335e0cbcf3.tar.bz2
Merge "wifi: P2P: Fix WFD subelement parsing"
Diffstat (limited to 'wifi/java/android/net/wifi/p2p')
-rw-r--r--wifi/java/android/net/wifi/p2p/WifiP2pDevice.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
index 7196c1b..398d987 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
@@ -126,7 +126,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=0x000006([0-9a-fA-F]{12}))?"
+ "( wfd_dev_info=0x([0-9a-fA-F]{12}))?"
);
/** 2 token device address pattern