LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 267a6181 to honeycomb-LTE

Browse Source 
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
This commit is contained in:
Irfan Sheriff
2011-06-21 22:46:51 -07:00
parent 33cdcdf2fa a3663884ca
commit a565295565
2 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/NetworkUtils.java
View File

@@ -53,16 +53,6 @@ public class NetworkUtils {
*/ */
public native static boolean runDhcp(String interfaceName, DhcpInfoInternal ipInfo); public native static boolean runDhcp(String interfaceName, DhcpInfoInternal ipInfo);
/**
* Initiate renewal on the Dhcp client daemon. This call blocks until it obtains
* a result (either success or failure) from the daemon.
* @param interfaceName the name of the interface to configure
* @param ipInfo if the request succeeds, this object is filled in with
* the IP address information.
* @return {@code true} for success, {@code false} for failure
*/
public native static boolean runDhcpRenew(String interfaceName, DhcpInfoInternal ipInfo);
/** /**
* Shut down the DHCP client daemon. * Shut down the DHCP client daemon.
* @param interfaceName the name of the interface for which the daemon * @param interfaceName the name of the interface for which the daemon

35
core/jni/android_net_NetUtils.cpp
View File

@@ -36,16 +36,6 @@ int dhcp_do_request(const char *ifname,
const char *dns2, const char *dns2,
const char *server, const char *server,
uint32_t *lease); uint32_t *lease);
int dhcp_do_request_renew(const char *ifname,
const char *ipaddr,
const char *gateway,
uint32_t *prefixLength,
const char *dns1,
const char *dns2,
const char *server,
uint32_t *lease);
int dhcp_stop(const char *ifname); int dhcp_stop(const char *ifname);
int dhcp_release_lease(const char *ifname); int dhcp_release_lease(const char *ifname);
char *dhcp_get_errmsg(); char *dhcp_get_errmsg();
@@ -101,8 +91,7 @@ static jint android_net_utils_resetConnections(JNIEnv* env, jobject clazz, jstri
return (jint)result; return (jint)result;
} }
static jboolean android_net_utils_runDhcpCommon(JNIEnv* env, jobject clazz, jstring ifname, static jboolean android_net_utils_runDhcp(JNIEnv* env, jobject clazz, jstring ifname, jobject info)
jobject info, bool renew)
{ {
int result; int result;
char ipaddr[PROPERTY_VALUE_MAX]; char ipaddr[PROPERTY_VALUE_MAX];
@@ -116,14 +105,8 @@ static jboolean android_net_utils_runDhcpCommon(JNIEnv* env, jobject clazz, jstr
const char *nameStr = env->GetStringUTFChars(ifname, NULL); const char *nameStr = env->GetStringUTFChars(ifname, NULL);
if (nameStr == NULL) return (jboolean)false; if (nameStr == NULL) return (jboolean)false;
if (renew) { result = ::dhcp_do_request(nameStr, ipaddr, gateway, &prefixLength,
result = ::dhcp_do_request_renew(nameStr, ipaddr, gateway, &prefixLength, dns1, dns2, server, &lease);
dns1, dns2, server, &lease);
} else {
result = ::dhcp_do_request(nameStr, ipaddr, gateway, &prefixLength,
dns1, dns2, server, &lease);
}
env->ReleaseStringUTFChars(ifname, nameStr); env->ReleaseStringUTFChars(ifname, nameStr);
if (result == 0 && dhcpInfoInternalFieldIds.dhcpInfoInternalClass != NULL) { if (result == 0 && dhcpInfoInternalFieldIds.dhcpInfoInternalClass != NULL) {
env->SetObjectField(info, dhcpInfoInternalFieldIds.ipaddress, env->NewStringUTF(ipaddr)); env->SetObjectField(info, dhcpInfoInternalFieldIds.ipaddress, env->NewStringUTF(ipaddr));
@@ -161,17 +144,6 @@ static jboolean android_net_utils_runDhcpCommon(JNIEnv* env, jobject clazz, jstr
return (jboolean)(result == 0); return (jboolean)(result == 0);
} }
static jboolean android_net_utils_runDhcp(JNIEnv* env, jobject clazz, jstring ifname, jobject info)
{
return android_net_utils_runDhcpCommon(env, clazz, ifname, info, false);
}
static jboolean android_net_utils_runDhcpRenew(JNIEnv* env, jobject clazz, jstring ifname, jobject info)
{
return android_net_utils_runDhcpCommon(env, clazz, ifname, info, true);
}
static jboolean android_net_utils_stopDhcp(JNIEnv* env, jobject clazz, jstring ifname) static jboolean android_net_utils_stopDhcp(JNIEnv* env, jobject clazz, jstring ifname)
{ {
int result; int result;
@@ -209,7 +181,6 @@ static JNINativeMethod gNetworkUtilMethods[] = {
{ "disableInterface", "(Ljava/lang/String;)I", (void *)android_net_utils_disableInterface }, { "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", (void *)android_net_utils_resetConnections },
{ "runDhcp", "(Ljava/lang/String;Landroid/net/DhcpInfoInternal;)Z", (void *)android_net_utils_runDhcp }, { "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 }, { "stopDhcp", "(Ljava/lang/String;)Z", (void *)android_net_utils_stopDhcp },
{ "releaseDhcpLease", "(Ljava/lang/String;)Z", (void *)android_net_utils_releaseDhcpLease }, { "releaseDhcpLease", "(Ljava/lang/String;)Z", (void *)android_net_utils_releaseDhcpLease },
{ "getDhcpError", "()Ljava/lang/String;", (void*) android_net_utils_getDhcpError }, { "getDhcpError", "()Ljava/lang/String;", (void*) android_net_utils_getDhcpError },