Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove disabled a11yservices from the binding services list."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-24 18:10:45 +00:00
committed by Android (Google) Code Review
parent efc9d1abfb 3a5a791dfe
commit e05e9da6bb
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -4144,7 +4144,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
if (readEnabledAccessibilityServicesLocked(userState)) {
mSecurityPolicy.onEnabledServicesChangedLocked(userState.mUserId,
userState.mEnabledServices);
userState.updateCrashedServicesIfNeededLocked();
userState.removeDisabledServicesFromTemporaryStatesLocked();
onUserStateChangedLocked(userState);
}
} else if (mTouchExplorationGrantedAccessibilityServicesUri.equals(uri)) {

14
services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java
View File

@@ -381,18 +381,22 @@ class AccessibilityUserState {
}
/**
* Remove service from crashed service list if users disable it.
* Remove the service from the crashed and binding service lists if the user disabled it.
*/
void updateCrashedServicesIfNeededLocked() {
void removeDisabledServicesFromTemporaryStatesLocked() {
for (int i = 0, count = mInstalledServices.size(); i < count; i++) {
final AccessibilityServiceInfo installedService = mInstalledServices.get(i);
final ComponentName componentName = ComponentName.unflattenFromString(
installedService.getId());
if (mCrashedServices.contains(componentName)
&& !mEnabledServices.contains(componentName)) {
// Remove it from mCrashedServices since users toggle the switch bar to retry.
if (!mEnabledServices.contains(componentName)) {
// Remove from mCrashedServices, since users may toggle the on/off switch to retry.
mCrashedServices.remove(componentName);
// Remove from mBindingServices, since services can get stuck in the binding state
// if binding starts but never finishes. If the service later attempts to finish
// binding but it is not in the enabled list then it will exit before initializing;
// see AccessibilityServiceConnection#initializeService().
mBindingServices.remove(componentName);
}
}
}