Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c60967fd: Merge "Don\'t update routes if Dhcp fails." into jb-mr2-dev

Browse Source 
* commit 'c60967fd83e7a736f311a1887543df430a65164c':
  Don't update routes if Dhcp fails.
This commit is contained in:
Lorenzo Colitti
2013-03-15 18:09:39 +00:00
committed by Android Git Automerger
parent 540f002c0b c60967fd83
commit c09d7cbf2b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/DhcpStateMachine.java
View File

@@ -359,7 +359,7 @@ public class DhcpStateMachine extends StateMachine {
} else if (dhcpAction == DhcpAction.RENEW) {
if (DBG) Log.d(TAG, "DHCP renewal on " + mInterfaceName);
success = NetworkUtils.runDhcpRenew(mInterfaceName, dhcpResults);
dhcpResults.updateFromDhcpRequest(mDhcpResults);
if (success) dhcpResults.updateFromDhcpRequest(mDhcpResults);
}
if (success) {
if (DBG) Log.d(TAG, "DHCP succeeded on " + mInterfaceName);

4
core/jni/android_net_NetUtils.cpp
View File

@@ -136,6 +136,10 @@ static jboolean android_net_utils_runDhcpCommon(JNIEnv* env, jobject clazz, jstr
result = ::dhcp_do_request(nameStr, ipaddr, gateway, &prefixLength,
dns, server, &lease, vendorInfo, domains);
}
if (result != 0) {
ALOGD("dhcp_do_request failed");
}
env->ReleaseStringUTFChars(ifname, nameStr);
if (result == 0) {
env->CallVoidMethod(dhcpResults, dhcpResultsFieldIds.clear);