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

Unverified Commit 599d592e authored by Ameer Armaly's avatar Ameer Armaly Committed by Kevin F. Haggerty
Browse files

[RESTRICT AUTOMERGE] AccessibilityManagerService: remove uninstalled services... 

[RESTRICT AUTOMERGE] AccessibilityManagerService: remove uninstalled services from enabled list after service update.

Bug: 326485767
Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5405514a23edcba0cf30e6ec78189e3f4e7d95cf)
Merged-In: I5e59296fcad68e62b34c74ee5fd80b6ad6b46fa1
Change-Id: I5e59296fcad68e62b34c74ee5fd80b6ad6b46fa1
parent 4fba1c29

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

+22 −0
Original line number Diff line number Diff line
@@ -1919,10 +1919,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        boolean isUnlockingOrUnlocked = LocalServices.getService(UserManagerInternal.class)

                    .isUserUnlockingOrUnlocked(userState.mUserId);



        // Store the list of installed services.

        mTempComponentNameSet.clear();

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

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

            ComponentName componentName = ComponentName.unflattenFromString(

                    installedService.getId());

            mTempComponentNameSet.add(componentName);



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

        }

        mActivityTaskManagerService.setAccessibilityServiceUids(mTempIntArray);

        // If any services have been removed, remove them from the enabled list and the touch

        // exploration granted list.

        boolean anyServiceRemoved =

                userState.mEnabledServices.removeIf((comp) -> !mTempComponentNameSet.contains(comp))

                        || userState.mTouchExplorationGrantedServices.removeIf(

                                (comp) -> !mTempComponentNameSet.contains(comp));

        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);

        }

        mTempComponentNameSet.clear();

        updateAccessibilityEnabledSettingLocked(userState);

    }