Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaf2e684 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by The Android Automerger
Browse files

Don't update routes if Dhcp fails. 

bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
parent 287255c7

core/java/android/net/DhcpStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/jni/android_net_NetUtils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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);