summaryrefslogtreecommitdiff
path: root/src/android/net/dhcp/DhcpClient.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-10 14:18:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 14:18:09 +0000
commit25c23226eaa6f858c05b60e011c0b250bd6c07be (patch)
tree1c2f6536d661a2214e304a425515b77399d80c62 /src/android/net/dhcp/DhcpClient.java
parent40c5a03f15ee4c53b1f3cae0befa3ae384c15d70 (diff)
parentf152f468ebd9d1160d1f23b4c111ea6fbb765043 (diff)
Merge "Disable IPv6 stack when IPv6 provisioning is lost but IPv4 is still alive." into rvc-dev am: 49053ad506 am: f152f468eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11807300 Change-Id: I033101e9ad4b4f17d105751816d80be0487f2ced
Diffstat (limited to 'src/android/net/dhcp/DhcpClient.java')
-rw-r--r--src/android/net/dhcp/DhcpClient.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java
index 5564503..4404273 100644
--- a/src/android/net/dhcp/DhcpClient.java
+++ b/src/android/net/dhcp/DhcpClient.java
@@ -503,9 +503,9 @@ public class DhcpClient extends StateMachine {
* check whether or not to support caching the last lease info and INIT-REBOOT state.
*
* INIT-REBOOT state is supported on Android R by default if there is no experiment flag set to
- * disable this feature explicitly, meanwhile we still hope to be able to control this feature
- * on/off by pushing experiment flag for A/B testing and metrics collection on both of Android
- * Q and R version, however it's disbled on Android Q by default.
+ * disable this feature explicitly, meanwhile turning this feature on/off by pushing experiment
+ * flag makes it possible to do A/B test and metrics collection on both of Android Q and R, but
+ * it's disabled on Android Q by default.
*/
public boolean isDhcpLeaseCacheEnabled() {
final boolean defaultEnabled =