commit 492713b99d769e8ac0f9a33b7a2d12409b12df86
author Xiao Ma <xiaom@google.com> Tue Jun 18 13:27:33 2019 +0900
committer Xiao Ma <xiaom@google.com> Mon Jul 29 08:11:39 2019 +0000
tree f19d9dbbc22bdc5ab95d442fecddbe85bb0a860f
parent 18ce8bce672a08b058515b48108f2e8ff2dd39a1

Reference the dhcp init reboot experiment flag.

Bug: 122710829
Test: FrameworksNetTests NetworkStackTests
Test: manual test
      adb shell device_config put NAMESPACE KEY VALUE

Merged-In: I044c903656ac4f343d6654820dfa1bb74a58135e
Merged-In: Ida5cffae19baaa5d71a0335bc7230809f4fcc486
Change-Id: I162a3da1f7412493c4df09f8e9e193a693c5aa07

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