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

Commit 1bcc4049 authored by Daniel Norman's avatar Daniel Norman
Browse files

RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. 

Bug: 353700779
Test: Install poc APKs from the bug, observe issue not reproducible
Test: (automated tests on 'main' branch)
Flag: NONE security fix
Change-Id: Ia8d43229d277dd4442173166ae0402f05096da4b
parent 708a2400

src/com/android/settings/accessibility/AccessibilitySettings.java

+0 −25
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.Context; 
import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.net.Uri;
@@ -407,17 +406,11 @@ public class AccessibilitySettings extends DashboardFragment { 
        final List<AccessibilityShortcutInfo> installedShortcutList =

                a11yManager.getInstalledAccessibilityShortcutListAsUser(context,

                        UserHandle.myUserId());



        // Remove duplicate item here, new a ArrayList to copy unmodifiable list result

        // (getInstalledAccessibilityServiceList).

        final List<AccessibilityServiceInfo> installedServiceList = new ArrayList<>(

                a11yManager.getInstalledAccessibilityServiceList());

        installedServiceList.removeIf(

                target -> containsTargetNameInList(installedShortcutList, target));



        final List<RestrictedPreference> activityList =

                preferenceHelper.createAccessibilityActivityPreferenceList(installedShortcutList);



        final List<RestrictedPreference> serviceList =

                preferenceHelper.createAccessibilityServicePreferenceList(installedServiceList);
@@ -428,24 +421,6 @@ public class AccessibilitySettings extends DashboardFragment { 
        return preferenceList;

    }



    private boolean containsTargetNameInList(List<AccessibilityShortcutInfo> shortcutInfos,

            AccessibilityServiceInfo targetServiceInfo) {

        final ServiceInfo serviceInfo = targetServiceInfo.getResolveInfo().serviceInfo;

        final String servicePackageName = serviceInfo.packageName;

        final CharSequence serviceLabel = serviceInfo.loadLabel(getPackageManager());



        for (int i = 0, count = shortcutInfos.size(); i < count; ++i) {

            final ActivityInfo activityInfo = shortcutInfos.get(i).getActivityInfo();

            final String activityPackageName = activityInfo.packageName;

            final CharSequence activityLabel = activityInfo.loadLabel(getPackageManager());

            if (servicePackageName.equals(activityPackageName)

                    && serviceLabel.equals(activityLabel)) {

                return true;

            }

        }

        return false;

    }



    private void initializePreBundledServicesMapFromArray(String categoryKey, int key) {

        String[] services = getResources().getStringArray(key);

        PreferenceCategory category = mCategoryToPrefCategoryMap.get(categoryKey);