Remove hardcoded 'p2p0' from WifiNative

WifiNative should get the p2p interface name from
SystemProperties instead hard-coded name.

BUG=27383938
TEST= cts & unit tests & manual test
Change-Id: I25a4280ee14252d01e4582ced90c1b456e4babb2

1 files changed, 7 insertions, 6 deletions

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 04be72fd7..9b28a4f14 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -109,13 +109,14 @@ public class WifiNative {
      * Singleton WifiNative instances
      */
     private static WifiNative wlanNativeInterface =
-            new WifiNative(SystemProperties.get("wifi.interface", "wlan0"));
+            new WifiNative(SystemProperties.get("wifi.interface", "wlan0"), true);
     public static WifiNative getWlanNativeInterface() {
         return wlanNativeInterface;
     }
 
-    //STOPSHIP: get interface name from native side
-    private static WifiNative p2pNativeInterface = new WifiNative("p2p0");
+    private static WifiNative p2pNativeInterface =
+            // commands for p2p0 interface don't need prefix
+            new WifiNative(SystemProperties.get("wifi.direct.interface", "p2p0"), false);
     public static WifiNative getP2pNativeInterface() {
         return p2pNativeInterface;
     }
@@ -134,14 +135,14 @@ public class WifiNative {
         }
     }
 
-    private WifiNative(String interfaceName) {
+    private WifiNative(String interfaceName,
+                       boolean requiresPrefix) {
         mInterfaceName = interfaceName;
         mTAG = "WifiNative-" + interfaceName;
 
-        if (!interfaceName.equals("p2p0")) {
+        if (requiresPrefix) {
             mInterfacePrefix = "IFNAME=" + interfaceName + " ";
         } else {
-            // commands for p2p0 interface don't need prefix
             mInterfacePrefix = "";
         }
     }