Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 2"

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

@@ -378,11 +378,11 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
         // First plan in the list is the primary plan
         SubscriptionPlan plan = plans.get(0);
         return plan.getDataLimitBytes() > 0
-                && saneSize(plan.getDataUsageBytes())
+                && validSize(plan.getDataUsageBytes())
                 && plan.getCycleRule() != null ? plan : null;
     }
 
-    private static boolean saneSize(long value) {
+    private static boolean validSize(long value) {
         return value >= 0L && value < PETA;
     }
 

src/com/android/settings/network/TetherProvisioningActivity.java

@@ -36,7 +36,7 @@ import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 
 /**
- * Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
+ * Activity which acts as a proxy to the tether provisioning app for validity checks and permission
  * restrictions. Specifically, the provisioning apps require
  * {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
  * with {@link android.permission.TETHER_PRIVILEGED}.

src/com/android/settings/wifi/WifiSettings.java

@@ -490,7 +490,7 @@ public class WifiSettings extends RestrictedSettingsFragment
         }
 
         // "forget" for normal saved network. And "disconnect" for ephemeral network because it
-        // could only be disconnected and be put in blacklists so it won't be used again.
+        // could only be disconnected and be put in blocklists so it won't be used again.
         if (canForgetNetwork()) {
             menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
         }

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

@@ -846,7 +846,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
     }
 
     private void refreshButtons() {
-        // Ephemeral network won't be removed permanently, but be putted in blacklist.
+        // Ephemeral network won't be removed permanently, but be putted in blocklist.
         mButtonsPref.setButton1Text(
                 mIsEphemeral ? R.string.wifi_disconnect_button_text : R.string.forget);