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

Commit 7f6998af authored by jasonwshsu's avatar jasonwshsu Committed by Jason Hsu
Browse files

Update language to comply with Android's inclusive language guidance 

1. Rename isClientInWhitelist to isClientInAllowlist

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

Bug: 162536543
Test: Build & run
Change-Id: If9c5a2599e13633d6e99993d857e2101b4e6e4ec
Merged-In: Ibbd97bf31915d59b5110cbcc8f2126f7a7221060
Merged-In: I915e09e4e64d5c268630cec2d0ef05ea0592fd6f
Merged-In: I499c4574464862f3a1dcea2c6d51813e23ba4b82
parent f8115452

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+8 −8
Original line number Diff line number Diff line
@@ -1488,19 +1488,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        int serviceCount = userState.mBoundServices.size();

        for (int i = 0; i < serviceCount; i++) {

            AccessibilityServiceConnection service = userState.mBoundServices.get(i);

            relevantEventTypes |= isClientInPackageWhitelist(service.getServiceInfo(), client)

            relevantEventTypes |= isClientInPackageAllowlist(service.getServiceInfo(), client)

                    ? service.getRelevantEventTypes()

                    : 0;

        }



        relevantEventTypes |= isClientInPackageWhitelist(

        relevantEventTypes |= isClientInPackageAllowlist(

                mUiAutomationManager.getServiceInfo(), client)

                ? mUiAutomationManager.getRelevantEventTypes()

                : 0;

        return relevantEventTypes;

    }



    private static boolean isClientInPackageWhitelist(

    private static boolean isClientInPackageAllowlist(

            @Nullable AccessibilityServiceInfo serviceInfo, Client client) {

        if (serviceInfo == null) return false;
@@ -1519,7 +1519,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                Slog.d(LOG_TAG, "Dropping events: "

                        + Arrays.toString(clientPackages) + " -> "

                        + serviceInfo.getComponentName().flattenToShortString()

                        + " due to not being in package whitelist "

                        + " due to not being in package allowlist "

                        + Arrays.toString(serviceInfo.packageNames));

            }

        }
@@ -1914,9 +1914,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    }



    private void updateLegacyCapabilitiesLocked(UserState userState) {

        // Up to JB-MR1 we had a white list with services that can enable touch

        // Up to JB-MR1 we had a allowlist with services that can enable touch

        // exploration. When a service is first started we show a dialog to the

        // use to get a permission to white list the service.

        // use to get a permission to allowlist the service.

        final int installedServiceCount = userState.mInstalledServices.size();

        for (int i = 0; i < installedServiceCount; i++) {

            AccessibilityServiceInfo serviceInfo = userState.mInstalledServices.get(i);
@@ -2184,9 +2184,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

        if (service.getServiceInfo().getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion

                <= Build.VERSION_CODES.JELLY_BEAN_MR1) {

            // Up to JB-MR1 we had a white list with services that can enable touch

            // Up to JB-MR1 we had a allowlist with services that can enable touch

            // exploration. When a service is first started we show a dialog to the

            // use to get a permission to white list the service.

            // use to get a permission to allowlist the service.

            if (userState.mTouchExplorationGrantedServices.contains(service.mComponentName)) {

                return true;

            } else if (mEnableTouchExplorationDialog == null