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

Commit 37966299 authored by Daniel Norman's avatar Daniel Norman
Browse files

RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package. 

Previous logic would exit the loop after removing the first service
matching the uninstalled package.

Bug: 243378132
Test: atest AccessibilityEndToEndTest
Test: m sts;
      sts-tradefed run sts-dynamic-develop -m \
        CtsAccessibilityServiceTestCases
Change-Id: I4ba30345d8600674ee8a9ea3ff411aecbf3655a3
parent 459808b2

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

+13 −11
Original line number Diff line number Diff line
@@ -427,25 +427,27 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    }

                    UserState userState = getUserStateLocked(userId);

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

                    boolean anyServiceRemoved = false;

                    while (it.hasNext()) {

                        ComponentName comp = it.next();

                        String compPkg = comp.getPackageName();

                        if (compPkg.equals(packageName)) {

                            it.remove();

                            userState.mBindingServices.remove(comp);

                            userState.mTouchExplorationGrantedServices.remove(comp);

                            anyServiceRemoved = true;

                        }

                    }

                    if (anyServiceRemoved) {

                        // Update the enabled services setting.

                        persistComponentNamesToSettingLocked(

                                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,

                                userState.mEnabledServices, userId);

                        // Update the touch exploration granted services setting.

                            userState.mTouchExplorationGrantedServices.remove(comp);

                        persistComponentNamesToSettingLocked(

                                    Settings.Secure.

                                    TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

                                Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

                                userState.mTouchExplorationGrantedServices, userId);

                        onUserStateChangedLocked(userState);

                            return;

                        }

                    }

                }

            }