commit 1aa06460c2c28946bcdd0e3b993b7a7c3210bfa2
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 31 03:14:20 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 31 03:14:20 2019 +0000
tree e625b4092b06f0841fef4240cac150c1d27ee67a
parent f648dfe6bfd11fbf88a00e6e81720a7dc1055332
parent 8c5b1cc57cdbc08ae7afa64d5f0f453ff830281b

Snap for 5767086 from 8c5b1cc57cdbc08ae7afa64d5f0f453ff830281b to qt-qpr1-release

Change-Id: I241c4eea95625eb99ec75902ca26a09e48e21a83

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");
     }