Merge "Fix a11y service targeting sdk version doesn't update" into rvc-dev

This commit is contained in:
Rhed Jao
2020-04-08 01:54:46 +00:00
committed by Android (Google) Code Review

View File

@@ -413,7 +413,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
&& component.getPackageName().equals(packageName)) && component.getPackageName().equals(packageName))
|| userState.mCrashedServices.removeIf(component -> component != null || userState.mCrashedServices.removeIf(component -> component != null
&& component.getPackageName().equals(packageName)); && 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); onUserStateChangedLocked(userState);
} }
migrateAccessibilityButtonSettingsIfNecessaryLocked(userState, packageName); migrateAccessibilityButtonSettingsIfNecessaryLocked(userState, packageName);