commit 734ce09555149684d9b56c5482c73e42752741ee
author Patrick Rohr <prohr@google.com> Mon Jul 22 10:08:59 2024 -0700
committer Patrick Rohr <prohr@google.com> Mon Jul 22 10:08:59 2024 -0700
tree 67f44811d4f1ed26bf2f8ca3204aced89883dd45
parent 530da21f7d142b2bff0373f70e6b0f3aa74a3255

Rename mEnableIpClientIgnoreLowRaLifetime

Mentioning the name of the sysctl makes it more consistent and
searchable.

Test: TH
Change-Id: I355ba407ca29d2d3a8741d9f35130092f8c8c231

src/android/net/ip/IpClient.java

diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index 7e21116..fd0aab0 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -732,7 +732,7 @@
     // Experiment flag read from device config.
     private final boolean mDhcp6PrefixDelegationEnabled;
     private final boolean mUseNewApfFilter;
-    private final boolean mEnableIpClientIgnoreLowRaLifetime;
+    private final boolean mIsAcceptRaMinLftEnabled;
     private final boolean mEnableApfPollingCounters;
     private final boolean mPopulateLinkAddressLifetime;
     private final boolean mApfShouldHandleArpOffload;
@@ -980,7 +980,7 @@
                 APF_NEW_RA_FILTER_VERSION);
         mEnableApfPollingCounters = mDependencies.isFeatureEnabled(context,
                 APF_POLLING_COUNTERS_VERSION);
-        mEnableIpClientIgnoreLowRaLifetime =
+        mIsAcceptRaMinLftEnabled =
                 SdkLevel.isAtLeastV() || mDependencies.isFeatureEnabled(context,
                         IPCLIENT_IGNORE_LOW_RA_LIFETIME_VERSION);
         mApfShouldHandleArpOffload = mDependencies.isFeatureNotChickenedOut(
@@ -2473,7 +2473,7 @@
         setIpv6Sysctl(ACCEPT_RA, 2);
         setIpv6Sysctl(ACCEPT_RA_DEFRTR, 1);
         maybeRestoreDadTransmits();
-        if (mUseNewApfFilter && mEnableIpClientIgnoreLowRaLifetime
+        if (mUseNewApfFilter && mIsAcceptRaMinLftEnabled
                 && mDependencies.hasIpv6Sysctl(mInterfaceName, ACCEPT_RA_MIN_LFT)) {
             setIpv6Sysctl(ACCEPT_RA_MIN_LFT, 0 /* sysctl default */);
         }
@@ -2602,7 +2602,7 @@
         // Check the feature flag first before reading IPv6 sysctl, which can prevent from
         // triggering a potential kernel bug about the sysctl.
         // TODO: add unit test to check if the setIpv6Sysctl() is called or not.
-        if (mEnableIpClientIgnoreLowRaLifetime && mUseNewApfFilter
+        if (mIsAcceptRaMinLftEnabled && mUseNewApfFilter
                 && mDependencies.hasIpv6Sysctl(mInterfaceName, ACCEPT_RA_MIN_LFT)) {
             setIpv6Sysctl(ACCEPT_RA_MIN_LFT, mAcceptRaMinLft);
             final Integer acceptRaMinLft = getIpv6Sysctl(ACCEPT_RA_MIN_LFT);