diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-01-10 15:50:45 -0800 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-01-25 05:23:24 -0800 |
| commit | 7d6d9c005e5cfad787bb62b7fee6be2d75b13ca3 (patch) | |
| tree | d169cdb76c2c7ea301abcc913f36ccd4f62df587 /core/jni/android_net_wifi_Wifi.cpp | |
| parent | ea77ed02e44ebd177e3c7e1797d9cb804820ce43 (diff) | |
| download | frameworks_base-7d6d9c005e5cfad787bb62b7fee6be2d75b13ca3.zip frameworks_base-7d6d9c005e5cfad787bb62b7fee6be2d75b13ca3.tar.gz frameworks_base-7d6d9c005e5cfad787bb62b7fee6be2d75b13ca3.tar.bz2 | |
Initial support for concurrency
Use of multiple socket connections over wlan0 and p2p and
p2p state machine is now controlled entirely from wifi state machine
Add discovery stop to allow STA scans to proceed after p2p is used
Change-Id: I790c9112d3f475f638f06fc3ae9e191f6d90ef35
Diffstat (limited to 'core/jni/android_net_wifi_Wifi.cpp')
| -rw-r--r-- | core/jni/android_net_wifi_Wifi.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp index 2ac3ca8..c5ff16e 100644 --- a/core/jni/android_net_wifi_Wifi.cpp +++ b/core/jni/android_net_wifi_Wifi.cpp @@ -116,14 +116,9 @@ static jboolean android_net_wifi_unloadDriver(JNIEnv* env, jobject) return (jboolean)(::wifi_unload_driver() == 0); } -static jboolean android_net_wifi_startSupplicant(JNIEnv* env, jobject) +static jboolean android_net_wifi_startSupplicant(JNIEnv* env, jobject, jboolean p2pSupported) { - return (jboolean)(::wifi_start_supplicant() == 0); -} - -static jboolean android_net_wifi_startP2pSupplicant(JNIEnv* env, jobject) -{ - return (jboolean)(::wifi_start_p2p_supplicant() == 0); + return (jboolean)(::wifi_start_supplicant(p2pSupported) == 0); } static jboolean android_net_wifi_killSupplicant(JNIEnv* env, jobject) @@ -207,8 +202,7 @@ static JNINativeMethod gWifiMethods[] = { { "loadDriver", "()Z", (void *)android_net_wifi_loadDriver }, { "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 }, + { "startSupplicant", "(Z)Z", (void *)android_net_wifi_startSupplicant }, { "killSupplicant", "()Z", (void *)android_net_wifi_killSupplicant }, { "connectToSupplicant", "(Ljava/lang/String;)Z", (void *)android_net_wifi_connectToSupplicant }, |