Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d43dfb63 authored by Chan Kim's avatar Chan Kim
Browse files

Update language to comply with Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for reference

For this round, the fixes are only applied to the following to minimize breaking dependencies:
  * comments (excluding javaDoc annotations)
	* private constants
	* private functions
	* parameters within functions

BYPASS_INCLUSIVE_LANGUAGE_REASON=Just updating a few select inclusive language violations.
No-Typo-Check: Changes focused on inclusive language violations.
BUG: 295342157
Change-Id: I26a09d5fe9b69e292ab245ec8b091668809622d9
parent e1ee1aab

core/java/com/android/internal/dynamicanimation/animation/DynamicAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ public abstract class DynamicAnimation<T extends DynamicAnimation<T>> 
            if (!mStartValueIsSet) {

                mValue = getPropertyValue();

            }

            // Sanity check:

            // Initial check:

            if (mValue > mMaxValue || mValue < mMinValue) {

                throw new IllegalArgumentException("Starting value need to be in between min"

                        + " value and max value");

core/java/com/android/internal/dynamicanimation/animation/SpringForce.java

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ public final class SpringForce implements Force { 
    }



    /**

     * Initialize the string by doing the necessary pre-calculation as well as some sanity check

     * Initialize the string by doing the necessary pre-calculation as well as some initial check

     * on the setup.

     *

     * @throws IllegalStateException if the final position is not yet set by the time the spring

core/java/com/android/server/SystemConfig.java

+8 −8
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class SystemConfig { 
    private static final int ALLOW_APP_CONFIGS = 0x008;

    private static final int ALLOW_PRIVAPP_PERMISSIONS = 0x010;

    private static final int ALLOW_OEM_PERMISSIONS = 0x020;

    private static final int ALLOW_HIDDENAPI_WHITELISTING = 0x040;

    private static final int ALLOW_HIDDENAPI_ALLOWLISTING = 0x040;

    private static final int ALLOW_ASSOCIATIONS = 0x080;

    // ALLOW_OVERRIDE_APP_RESTRICTIONS allows to use "allow-in-power-save-except-idle",

    // "allow-in-power-save", "allow-in-data-usage-save","allow-unthrottled-location",
@@ -234,7 +234,7 @@ public class SystemConfig { 
    final ArrayMap<String, PermissionEntry> mPermissions = new ArrayMap<>();



    // These are the packages that are white-listed to be able to run in the

    // background while in power save mode (but not whitelisted from device idle modes),

    // background while in power save mode (but not allowlisted from device idle modes),

    // as read from the configuration files.

    final ArraySet<String> mAllowInPowerSaveExceptIdle = new ArraySet<>();
@@ -258,7 +258,7 @@ public class SystemConfig { 
    // location settings are off, for emergency purposes, as read from the configuration files.

    final ArrayMap<String, ArraySet<String>> mAllowIgnoreLocationSettings = new ArrayMap<>();



    // These are the action strings of broadcasts which are whitelisted to

    // These are the action strings of broadcasts which are allowlisted to

    // be delivered anonymously even to apps which target O+.

    final ArraySet<String> mAllowImplicitBroadcasts = new ArraySet<>();
@@ -281,7 +281,7 @@ public class SystemConfig { 
    final ArrayMap<String, ArrayMap<String, Boolean>> mPackageComponentEnabledState =

            new ArrayMap<>();



    // Package names that are exempted from private API blacklisting

    // Package names that are exempted from private API denylisting

    final ArraySet<String> mHiddenApiPackageWhitelist = new ArraySet<>();



    // The list of carrier applications which should be disabled until used.
@@ -562,7 +562,7 @@ public class SystemConfig { 


    /**

     * Gets map of packagesNames to userTypes, dictating on which user types each package should NOT

     * be initially installed, even if they are whitelisted, and then removes this map from

     * be initially installed, even if they are allowlisted, and then removes this map from

     * SystemConfig.

     * Called by UserManagerService when it is constructed.

     */
@@ -670,10 +670,10 @@ public class SystemConfig { 
                Environment.getOemDirectory(), "etc", "permissions"), oemPermissionFlag);



        // Allow Product to customize these configs

        // TODO(b/157203468): ALLOW_HIDDENAPI_WHITELISTING must be removed because we prohibited

        // TODO(b/157203468): ALLOW_HIDDENAPI_ALLOWLISTING must be removed because we prohibited

        // the use of hidden APIs from the product partition.

        int productPermissionFlag = ALLOW_FEATURES | ALLOW_LIBS | ALLOW_PERMISSIONS

                | ALLOW_APP_CONFIGS | ALLOW_PRIVAPP_PERMISSIONS | ALLOW_HIDDENAPI_WHITELISTING

                | ALLOW_APP_CONFIGS | ALLOW_PRIVAPP_PERMISSIONS | ALLOW_HIDDENAPI_ALLOWLISTING

                | ALLOW_ASSOCIATIONS | ALLOW_OVERRIDE_APP_RESTRICTIONS | ALLOW_IMPLICIT_BROADCASTS

                | ALLOW_VENDOR_APEX;

        if (Build.VERSION.DEVICE_INITIAL_SDK_INT <= Build.VERSION_CODES.R) {
@@ -797,7 +797,7 @@ public class SystemConfig { 
            final boolean allowPrivappPermissions = (permissionFlag & ALLOW_PRIVAPP_PERMISSIONS)

                    != 0;

            final boolean allowOemPermissions = (permissionFlag & ALLOW_OEM_PERMISSIONS) != 0;

            final boolean allowApiWhitelisting = (permissionFlag & ALLOW_HIDDENAPI_WHITELISTING)

            final boolean allowApiWhitelisting = (permissionFlag & ALLOW_HIDDENAPI_ALLOWLISTING)

                    != 0;

            final boolean allowAssociations = (permissionFlag & ALLOW_ASSOCIATIONS) != 0;

            final boolean allowOverrideAppRestrictions =