summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-11-03 23:20:38 -0700
committerIrfan Sheriff <isheriff@google.com>2012-11-06 15:53:32 -0800
commit511d5346ced4b37e4ba68e0bd089d4dad8b3bff7 (patch)
treecbf9b1ab86fc59983536a26cc33fc23c062a1cb1 /core/jni
parentbbe5cafeebbbd08516909a3d9d12d5d319cba345 (diff)
downloadframeworks_base-511d5346ced4b37e4ba68e0bd089d4dad8b3bff7.zip
frameworks_base-511d5346ced4b37e4ba68e0bd089d4dad8b3bff7.tar.gz
frameworks_base-511d5346ced4b37e4ba68e0bd089d4dad8b3bff7.tar.bz2
Stop supplicant and dhcp before start
Bug: 7227463 Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_net_wifi_Wifi.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp
index e7c4c23..9537ac4 100644
--- a/core/jni/android_net_wifi_Wifi.cpp
+++ b/core/jni/android_net_wifi_Wifi.cpp
@@ -122,9 +122,9 @@ static jboolean android_net_wifi_startSupplicant(JNIEnv* env, jobject, jboolean
return (jboolean)(::wifi_start_supplicant(p2pSupported) == 0);
}
-static jboolean android_net_wifi_killSupplicant(JNIEnv* env, jobject)
+static jboolean android_net_wifi_killSupplicant(JNIEnv* env, jobject, jboolean p2pSupported)
{
- return (jboolean)(::wifi_stop_supplicant() == 0);
+ return (jboolean)(::wifi_stop_supplicant(p2pSupported) == 0);
}
static jboolean android_net_wifi_connectToSupplicant(JNIEnv* env, jobject, jstring jIface)
@@ -204,7 +204,7 @@ static JNINativeMethod gWifiMethods[] = {
{ "isDriverLoaded", "()Z", (void *)android_net_wifi_isDriverLoaded },
{ "unloadDriver", "()Z", (void *)android_net_wifi_unloadDriver },
{ "startSupplicant", "(Z)Z", (void *)android_net_wifi_startSupplicant },
- { "killSupplicant", "()Z", (void *)android_net_wifi_killSupplicant },
+ { "killSupplicant", "(Z)Z", (void *)android_net_wifi_killSupplicant },
{ "connectToSupplicant", "(Ljava/lang/String;)Z",
(void *)android_net_wifi_connectToSupplicant },
{ "closeSupplicantConnection", "(Ljava/lang/String;)V",