Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use seperate config file for p2p"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-08-29 15:22:58 -07:00
committed by Android (Google) Code Review
parent 35c0bf31eb f42c39b3d1
commit 335e40c0f1
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_net_wifi_Wifi.cpp
View File

@@ -124,6 +124,11 @@ static jboolean android_net_wifi_startSupplicant(JNIEnv* env, jobject)
return (jboolean)(::wifi_start_supplicant() == 0); 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) static jboolean android_net_wifi_stopSupplicant(JNIEnv* env, jobject)
{ {
return doBooleanCommand("OK", "TERMINATE"); return doBooleanCommand("OK", "TERMINATE");
@@ -581,6 +586,7 @@ static JNINativeMethod gWifiMethods[] = {
{ "isDriverLoaded", "()Z", (void *)android_net_wifi_isDriverLoaded}, { "isDriverLoaded", "()Z", (void *)android_net_wifi_isDriverLoaded},
{ "unloadDriver", "()Z", (void *)android_net_wifi_unloadDriver }, { "unloadDriver", "()Z", (void *)android_net_wifi_unloadDriver },
{ "startSupplicant", "()Z", (void *)android_net_wifi_startSupplicant }, { "startSupplicant", "()Z", (void *)android_net_wifi_startSupplicant },
{ "startP2pSupplicant", "()Z", (void *)android_net_wifi_startP2pSupplicant },
{ "stopSupplicant", "()Z", (void*) android_net_wifi_stopSupplicant }, { "stopSupplicant", "()Z", (void*) android_net_wifi_stopSupplicant },
{ "killSupplicant", "()Z", (void *)android_net_wifi_killSupplicant }, { "killSupplicant", "()Z", (void *)android_net_wifi_killSupplicant },
{ "connectToSupplicant", "()Z", (void *)android_net_wifi_connectToSupplicant }, { "connectToSupplicant", "()Z", (void *)android_net_wifi_connectToSupplicant },

4
wifi/java/android/net/wifi/WifiNative.java
View File

@@ -60,7 +60,9 @@ public class WifiNative {
public native static boolean startSupplicant(); 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 * Note that underneath we use a harsh-sounding "terminate" supplicant command
* for a graceful stop and a mild-sounding "stop" interface * for a graceful stop and a mild-sounding "stop" interface

2
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@@ -514,7 +514,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
if (DBG) Slog.w(TAG, "Unable to bring down wlan interface: " + e); if (DBG) Slog.w(TAG, "Unable to bring down wlan interface: " + e);
} }
if (WifiNative.startSupplicant()) { if (WifiNative.startP2pSupplicant()) {
mWifiMonitor.startMonitoring(); mWifiMonitor.startMonitoring();
transitionTo(mP2pEnablingState); transitionTo(mP2pEnablingState);
} else { } else {