commit a7ce823818829597767ef4d11b8842f31e302320
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 31 03:05:43 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 31 03:05:43 2019 +0000
tree e625b4092b06f0841fef4240cac150c1d27ee67a
parent 5128d1f5a35c62ad06c61fab38e4c8edb8107f66
parent 1c836aad0b8e1ea7a3bd5bd87ae4b82c7c7e71fe

Snap for 5768201 from 1c836aad0b8e1ea7a3bd5bd87ae4b82c7c7e71fe to qt-c2f2-release

Change-Id: I8b5c60a9db68aa8a6da5392dd94016017fbba24e

src/android/net/dhcp/DhcpClient.java

diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java
index bd36d16..c45fc82 100644
--- a/src/android/net/dhcp/DhcpClient.java
+++ b/src/android/net/dhcp/DhcpClient.java
@@ -332,9 +332,9 @@
      *
      */
     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

diff --git a/src/android/net/util/NetworkStackUtils.java b/src/android/net/util/NetworkStackUtils.java
index 9bf1b96..978cedb 100644
--- a/src/android/net/util/NetworkStackUtils.java
+++ b/src/android/net/util/NetworkStackUtils.java
@@ -108,6 +108,11 @@
      */
     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");
     }