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

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

Also use PMI for onPackageRemoved to reduce test flakiness. 

Similar to
commit e04eb4fa,
this allows AccessibilityManagerService to be notified sooner when
a package is uninstalled. Without this, sometimes the uninstall message
can be delayed by 30+ seconds causing tests to fail.

Bug: 261217661
Test: atest AccessibilityEndToEndTest#testUninstallPackage_DisablesMultipleServices
Test: Rerun on go/abtd multiple times to observe decrease in flakiness
Change-Id: I8d5bb38f5fe2ade55bc957ebbe7fbb5b127ab205
parent eecb4d28

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

+42 −28
Original line number Diff line number Diff line
@@ -636,6 +636,37 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

    }



    private void onPackageRemovedLocked(String packageName) {

        final AccessibilityUserState userState = getCurrentUserState();

        final Predicate<ComponentName> filter =

                component -> component != null && component.getPackageName().equals(

                        packageName);

        userState.mBindingServices.removeIf(filter);

        userState.mCrashedServices.removeIf(filter);

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

        boolean anyServiceRemoved = false;

        while (it.hasNext()) {

            final ComponentName comp = it.next();

            final String compPkg = comp.getPackageName();

            if (compPkg.equals(packageName)) {

                it.remove();

                userState.mTouchExplorationGrantedServices.remove(comp);

                anyServiceRemoved = true;

            }

        }

        if (anyServiceRemoved) {

            // Update the enabled services setting.

            persistComponentNamesToSettingLocked(

                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,

                    userState.mEnabledServices, mCurrentUserId);

            // Update the touch exploration granted services setting.

            persistComponentNamesToSettingLocked(

                    Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

                    userState.mTouchExplorationGrantedServices, mCurrentUserId);

            onUserStateChangedLocked(userState);

        }

    }



    private void registerBroadcastReceivers() {

        PackageMonitor monitor = new PackageMonitor() {

            @Override
@@ -708,34 +739,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    if (userId != mCurrentUserId) {

                        return;

                    }

                    final AccessibilityUserState userState = getUserStateLocked(userId);

                    final Predicate<ComponentName> filter =

                            component -> component != null && component.getPackageName().equals(

                                    packageName);

                    userState.mBindingServices.removeIf(filter);

                    userState.mCrashedServices.removeIf(filter);

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

                    boolean anyServiceRemoved = false;

                    while (it.hasNext()) {

                        final ComponentName comp = it.next();

                        final String compPkg = comp.getPackageName();

                        if (compPkg.equals(packageName)) {

                            it.remove();

                            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.

                        persistComponentNamesToSettingLocked(

                                Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

                                userState.mTouchExplorationGrantedServices, userId);

                        onUserStateChangedLocked(userState);

                    }

                    onPackageRemovedLocked(packageName);

                }

            }
@@ -798,6 +802,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                        }

                    }

                }



                @Override

                public void onPackageRemoved(String packageName, int uid) {

                    final int userId = UserHandle.getUserId(uid);

                    synchronized (mLock) {

                        if (userId == mCurrentUserId) {

                            onPackageRemovedLocked(packageName);

                        }

                    }

                }

            });

        }