From f42c39b3d188ebb3ba9003cffc530717829fe874 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Fri, 26 Aug 2011 14:45:23 -0700 Subject: [PATCH] Use seperate config file for p2p Keep p2p and sta config seperate to avoid conflicts. Bug: 5002384 Change-Id: I8f8fc5f984f4f91f9ece4012bf536daa5cc00bba --- core/jni/android_net_wifi_Wifi.cpp | 6 ++++++ wifi/java/android/net/wifi/WifiNative.java | 4 +++- wifi/java/android/net/wifi/p2p/WifiP2pService.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp index 3cbd9124d8cdd..84a50f029e67f 100644 --- a/core/jni/android_net_wifi_Wifi.cpp +++ b/core/jni/android_net_wifi_Wifi.cpp @@ -124,6 +124,11 @@ static jboolean android_net_wifi_startSupplicant(JNIEnv* env, jobject) return (jboolean)(::wifi_start_supplicant() == 0); } +static jboolean android_net_wifi_startP2pSupplicant(JNIEnv* env, jobject) +{ + return (jboolean)(::wifi_start_p2p_supplicant() == 0); +} + static jboolean android_net_wifi_stopSupplicant(JNIEnv* env, jobject) { return doBooleanCommand("OK", "TERMINATE"); @@ -581,6 +586,7 @@ static JNINativeMethod gWifiMethods[] = { { "isDriverLoaded", "()Z", (void *)android_net_wifi_isDriverLoaded}, { "unloadDriver", "()Z", (void *)android_net_wifi_unloadDriver }, { "startSupplicant", "()Z", (void *)android_net_wifi_startSupplicant }, + { "startP2pSupplicant", "()Z", (void *)android_net_wifi_startP2pSupplicant }, { "stopSupplicant", "()Z", (void*) android_net_wifi_stopSupplicant }, { "killSupplicant", "()Z", (void *)android_net_wifi_killSupplicant }, { "connectToSupplicant", "()Z", (void *)android_net_wifi_connectToSupplicant }, diff --git a/wifi/java/android/net/wifi/WifiNative.java b/wifi/java/android/net/wifi/WifiNative.java index c1f67853ccf2b..8d327d01fb2f2 100644 --- a/wifi/java/android/net/wifi/WifiNative.java +++ b/wifi/java/android/net/wifi/WifiNative.java @@ -60,7 +60,9 @@ public class WifiNative { public native static boolean startSupplicant(); - /* Does a graceful shutdown of supplicant. + public native static boolean startP2pSupplicant(); + + /* Does a graceful shutdown of supplicant. Is a common stop function for both p2p and sta. * * Note that underneath we use a harsh-sounding "terminate" supplicant command * for a graceful stop and a mild-sounding "stop" interface diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index adf13be41cb06..bdf01201e98ed 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -514,7 +514,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { if (DBG) Slog.w(TAG, "Unable to bring down wlan interface: " + e); } - if (WifiNative.startSupplicant()) { + if (WifiNative.startP2pSupplicant()) { mWifiMonitor.startMonitoring(); transitionTo(mP2pEnablingState); } else {