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

Commit dd25384d authored by Ameer Armaly's avatar Ameer Armaly
Browse files

AccessibilityManagerService: remove uninstalled services from enabled list after service update. 

Bug: 326485767
Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService
Change-Id: I788897819d6a8fc3b3b343d4fe9cb7d810d2c8b9
parent af27ba90

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

+24 −0
Original line number Diff line number Diff line
@@ -2703,11 +2703,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        Map<ComponentName, AccessibilityServiceConnection> componentNameToServiceMap =

                userState.mComponentNameToServiceMap;

        boolean isUnlockingOrUnlocked = mUmi.isUserUnlockingOrUnlocked(userState.mUserId);

        Set<ComponentName> installedComponentNames = new HashSet<>();



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

            AccessibilityServiceInfo installedService = userState.mInstalledServices.get(i);

            ComponentName componentName = ComponentName.unflattenFromString(

                    installedService.getId());

            installedComponentNames.add(componentName);



            AccessibilityServiceConnection service = componentNameToServiceMap.get(componentName);
@@ -2767,6 +2769,28 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            audioManager.setAccessibilityServiceUids(mTempIntArray);

        }

        mActivityTaskManagerService.setAccessibilityServiceUids(mTempIntArray);

        final Iterator<ComponentName> it = userState.mEnabledServices.iterator();

        boolean anyServiceRemoved = false;

        while (it.hasNext()) {

            final ComponentName comp = it.next();

            if (!installedComponentNames.contains(comp)) {

                it.remove();

                userState.mTouchExplorationGrantedServices.remove(comp);

                anyServiceRemoved = true;

            }

        }

        if (anyServiceRemoved) {

            // Update the enabled services setting.

            persistComponentNamesToSettingLocked(

                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,

                    userState.mEnabledServices,

                    userState.mUserId);

            // Update the touch exploration granted services setting.

            persistComponentNamesToSettingLocked(

                    Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

                    userState.mTouchExplorationGrantedServices,

                    userState.mUserId);

        }

        updateAccessibilityEnabledSettingLocked(userState);

    }