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

Commit f74e5ccb authored by Rhed Jao's avatar Rhed Jao
Browse files

Fix a11y service targeting sdk version doesn't update 

The accessibility service connection uses old service info
to create connection while the system is trying to rebind the
enabled services after packages finished updated. The root
cause is we always reloaded the installed service info after
the a11y services were rebound. To fix this issue, always
reloads the installed service info before rebinds the services.

Bug: 152817355
Test: All a11y related cts tests
Change-Id: Iab424940fc47b5a5f44096d67dc7bdfe2d43c5be
parent 60e3892f

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

+6 −1
Original line number Diff line number Diff line
@@ -414,7 +414,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                                    && component.getPackageName().equals(packageName))

                            || userState.mCrashedServices.removeIf(component -> component != null

                                    && component.getPackageName().equals(packageName));

                    if (reboundAService) {

                    // Reloads the installed services info to make sure the rebound service could

                    // get a new one.

                    userState.mInstalledServices.clear();

                    final boolean configurationChanged =

                            readConfigurationForUserStateLocked(userState);

                    if (reboundAService || configurationChanged) {

                        onUserStateChangedLocked(userState);

                    }

                    migrateAccessibilityButtonSettingsIfNecessaryLocked(userState, packageName);