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

Commit f08b3a43 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Stops hiding a11y services with the same package+label as an activity... 

Merge "Stops hiding a11y services with the same package+label as an activity in shortcut logic." into main
parents fbe9ad7a 405dfa29

core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java

+2 −34
Original line number Diff line number Diff line
@@ -109,45 +109,13 @@ public final class AccessibilityTargetHelper { 
    public static List<AccessibilityTarget> getInstalledTargets(Context context,

            @UserShortcutType int shortcutType) {

        final List<AccessibilityTarget> targets = new ArrayList<>();

        targets.addAll(getAccessibilityFilteredTargets(context, shortcutType));

        targets.addAll(getAccessibilityServiceTargets(context, shortcutType));

        targets.addAll(getAccessibilityActivityTargets(context, shortcutType));

        targets.addAll(getAllowListingFeatureTargets(context, shortcutType));



        return targets;

    }



    private static List<AccessibilityTarget> getAccessibilityFilteredTargets(Context context,

            @UserShortcutType int shortcutType) {

        final List<AccessibilityTarget> serviceTargets =

                getAccessibilityServiceTargets(context, shortcutType);

        final List<AccessibilityTarget> activityTargets =

                getAccessibilityActivityTargets(context, shortcutType);



        for (AccessibilityTarget activityTarget : activityTargets) {

            serviceTargets.removeIf(

                    serviceTarget -> arePackageNameAndLabelTheSame(serviceTarget, activityTarget));

        }



        final List<AccessibilityTarget> targets = new ArrayList<>();

        targets.addAll(serviceTargets);

        targets.addAll(activityTargets);



        return targets;

    }



    private static boolean arePackageNameAndLabelTheSame(@NonNull AccessibilityTarget serviceTarget,

            @NonNull AccessibilityTarget activityTarget) {

        final ComponentName serviceComponentName =

                ComponentName.unflattenFromString(serviceTarget.getId());

        final ComponentName activityComponentName =

                ComponentName.unflattenFromString(activityTarget.getId());

        final boolean isSamePackageName = activityComponentName.getPackageName().equals(

                serviceComponentName.getPackageName());

        final boolean isSameLabel = activityTarget.getLabel().equals(

                serviceTarget.getLabel());



        return isSamePackageName && isSameLabel;

    }



    private static List<AccessibilityTarget> getAccessibilityServiceTargets(Context context,

            @UserShortcutType int shortcutType) {

        final AccessibilityManager am = (AccessibilityManager) context.getSystemService(