summaryrefslogtreecommitdiffstats
path: root/wifi/java
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-08-16 23:43:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-16 23:45:52 +0000
commitb3acd8ef263e17879e9a13c3dacd123bd0670c3b (patch)
treed1b02c4fa805c9a68c88375df4f2a24673f77343 /wifi/java
parentd1477e746065450b1900398e103f4715ccf81b35 (diff)
parent2de3a5762f4c77852810d8f6de6b60aabee9a38e (diff)
downloadframeworks_base-b3acd8ef263e17879e9a13c3dacd123bd0670c3b.zip
frameworks_base-b3acd8ef263e17879e9a13c3dacd123bd0670c3b.tar.gz
frameworks_base-b3acd8ef263e17879e9a13c3dacd123bd0670c3b.tar.bz2
Merge "wifi: Do not use prefix for p2p commands" into klp-dev
Diffstat (limited to 'wifi/java')
-rw-r--r--wifi/java/android/net/wifi/WifiNative.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiNative.java b/wifi/java/android/net/wifi/WifiNative.java
index 48c5ae3..c3ed03c 100644
--- a/wifi/java/android/net/wifi/WifiNative.java
+++ b/wifi/java/android/net/wifi/WifiNative.java
@@ -82,8 +82,13 @@ public class WifiNative {
public WifiNative(String interfaceName) {
mInterfaceName = interfaceName;
- mInterfacePrefix = "IFNAME=" + interfaceName + " ";
mTAG = "WifiNative-" + interfaceName;
+ if (!interfaceName.equals("p2p0")) {
+ mInterfacePrefix = "IFNAME=" + interfaceName + " ";
+ } else {
+ // commands for p2p0 interface don't need prefix
+ mInterfacePrefix = "";
+ }
}
public boolean connectToSupplicant() {