Merge "Update language to comply with Android's inclusive language guidance"

src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java

@@ -112,7 +112,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
 
         for (int i = 0, size = batteryTips.size(); i < size; i++) {
             final BatteryTip batteryTip = mBatteryTips.get(i);
-            batteryTip.sanityCheck(mContext);
+            batteryTip.validateCheck(mContext);
             if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) {
                 batteryTip.updatePreference(mCardPreference);
                 mBatteryTipMap.put(mCardPreference.getKey(), batteryTip);

src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java

@@ -138,7 +138,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
      * Check whether data is still make sense. If not, try recover.
      * @param context used to do validate check
      */
-    public void sanityCheck(Context context) {
+    public void validateCheck(Context context) {
         // do nothing
     }
 

src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java

@@ -107,8 +107,8 @@ public class RestrictAppTip extends BatteryTip {
     }
 
     @Override
-    public void sanityCheck(Context context) {
-        super.sanityCheck(context);
+    public void validateCheck(Context context) {
+        super.validateCheck(context);
 
         // Set it invisible if there is no valid app
         mRestrictAppList.removeIf(AppLabelPredicate.getInstance(context));