diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-11-06 17:43:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-06 17:43:05 -0800 |
| commit | f264e8e34e32bfb8e7e75b61b9da9b6f219690b0 (patch) | |
| tree | dc2081d0a0962d6ad2c227443d38ba67486ee634 /core/jni | |
| parent | a517fc3a393b075a677ef3052e22749951ede8fa (diff) | |
| parent | 567a2919f3ad66dcb972e45411d18a4515d9f0b1 (diff) | |
| download | frameworks_base-f264e8e34e32bfb8e7e75b61b9da9b6f219690b0.zip frameworks_base-f264e8e34e32bfb8e7e75b61b9da9b6f219690b0.tar.gz frameworks_base-f264e8e34e32bfb8e7e75b61b9da9b6f219690b0.tar.bz2 | |
am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
Stop supplicant and dhcp before start
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_net_wifi_Wifi.cpp | 6 |
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", |