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

Commit 04ddd768 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

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

Merge "Update language to comply with Android's inclusive language guidance" into rvc-d1-dev-plus-aosp am: 8dc88a6a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12371144

Change-Id: I64a93918ba6206c48a2416e53c0320dae41f8ce2
parents cbfb9f15 8dc88a6a

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

+8 −8
Original line number Diff line number Diff line
@@ -1464,19 +1464,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;
@@ -1495,7 +1495,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));

            }

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



    private void updateLegacyCapabilitiesLocked(AccessibilityUserState 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);
@@ -2155,9 +2155,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