diff options
| author | Wink Saville <wink@google.com> | 2011-07-08 09:40:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-08 09:40:08 -0700 |
| commit | e4a56a32ac243dad5e7fa33c5de4777d9a4b8162 (patch) | |
| tree | b70d0f122b143843a4a99c741e9017af7f1b4470 /core/jni | |
| parent | a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00 (diff) | |
| parent | 8171e6f690cca1bad354e7e352823d79d420daf3 (diff) | |
| download | frameworks_base-e4a56a32ac243dad5e7fa33c5de4777d9a4b8162.zip frameworks_base-e4a56a32ac243dad5e7fa33c5de4777d9a4b8162.tar.gz frameworks_base-e4a56a32ac243dad5e7fa33c5de4777d9a4b8162.tar.bz2 | |
am 8171e6f6: Use resetConnections with resetMask.
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_net_NetUtils.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 68d1b3a..068fe67 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -26,7 +26,7 @@ extern "C" { int ifc_enable(const char *ifname); int ifc_disable(const char *ifname); -int ifc_reset_connections(const char *ifname); +int ifc_reset_connections(const char *ifname, int reset_mask); int dhcp_do_request(const char *ifname, const char *ipaddr, @@ -91,12 +91,17 @@ static jint android_net_utils_disableInterface(JNIEnv* env, jobject clazz, jstri return (jint)result; } -static jint android_net_utils_resetConnections(JNIEnv* env, jobject clazz, jstring ifname) +static jint android_net_utils_resetConnections(JNIEnv* env, jobject clazz, + jstring ifname, jint mask) { int result; const char *nameStr = env->GetStringUTFChars(ifname, NULL); - result = ::ifc_reset_connections(nameStr); + + LOGD("android_net_utils_resetConnections in env=%p clazz=%p iface=%s mask=0x%x\n", + env, clazz, nameStr, mask); + + result = ::ifc_reset_connections(nameStr, mask); env->ReleaseStringUTFChars(ifname, nameStr); return (jint)result; } @@ -207,7 +212,7 @@ static JNINativeMethod gNetworkUtilMethods[] = { { "enableInterface", "(Ljava/lang/String;)I", (void *)android_net_utils_enableInterface }, { "disableInterface", "(Ljava/lang/String;)I", (void *)android_net_utils_disableInterface }, - { "resetConnections", "(Ljava/lang/String;)I", (void *)android_net_utils_resetConnections }, + { "resetConnections", "(Ljava/lang/String;I)I", (void *)android_net_utils_resetConnections }, { "runDhcp", "(Ljava/lang/String;Landroid/net/DhcpInfoInternal;)Z", (void *)android_net_utils_runDhcp }, { "runDhcpRenew", "(Ljava/lang/String;Landroid/net/DhcpInfoInternal;)Z", (void *)android_net_utils_runDhcpRenew }, { "stopDhcp", "(Ljava/lang/String;)Z", (void *)android_net_utils_stopDhcp }, |