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

Commit 8c5b1cc5 authored by Xiao Ma's avatar Xiao Ma Committed by android-build-merger
Browse files

Merge "Reference the dhcp init reboot experiment flag." into qt-r1-dev 

am: 1c836aad

Change-Id: I0ba4c86929822c81dc45f99386b2f06805ba0f50
parents c464fc6f 1c836aad

src/android/net/dhcp/DhcpClient.java

+3 −3
Original line number Diff line number Diff line
@@ -332,9 +332,9 @@ public class DhcpClient extends StateMachine { 
     *

     */

    public boolean isDhcpLeaseCacheEnabled() {

        // TODO: call DeviceConfig.getProperty(DeviceConfig.NAMESPACE_CONNECTIVITY,

        //                    DeviceConfig.PROPERTY);

        // to fetch the dynamic experiment flag value. Return false by default.

        mDhcpLeaseCacheEnabled = Boolean.parseBoolean(NetworkStackUtils.getDeviceConfigProperty(

                NetworkStackUtils.NAMESPACE_CONNECTIVITY,

                NetworkStackUtils.DHCP_INIT_REBOOT_ENABLED, "false"));

        return mDhcpLeaseCacheEnabled;

    }

src/android/net/util/NetworkStackUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ public class NetworkStackUtils { 
     */

    public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;



    /**

     * Experiment flag to enable DHCP INIT-REBOOT state, default value is false.

     */

    public static final String DHCP_INIT_REBOOT_ENABLED = "dhcp_init_reboot_enabled";



    static {

        System.loadLibrary("networkstackutilsjni");

    }