PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the logic of querying crashed a11y services

Browse Source 
Bug: 129689483
Test: a11y CTS & unit tests
Test: manual
      1. Install and enable an intentional crashed a11y service.
      2. After it's crashed and malfunctioning, re-enable it.
      3. Check if it's bound again.

Change-Id: Ifda4fddfbe9b38841f5cc143c32ab1d2f059350c
This commit is contained in:
Jackal Guo
2019-10-07 13:35:50 +08:00
parent 764115ca4e
commit 52bd31f5df
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
View File

@@ -135,9 +135,6 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
final String packageName = serviceInfo.packageName; final String packageName = serviceInfo.packageName;
final ComponentName componentName = new ComponentName(packageName, serviceInfo.name); final ComponentName componentName = new ComponentName(packageName, serviceInfo.name);
final List<AccessibilityServiceInfo> enabledServiceInfos = AccessibilityManager.getInstance(
getActivity()).getEnabledAccessibilityServiceList(
AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
final Set<ComponentName> enabledServices = final Set<ComponentName> enabledServices =
AccessibilityUtils.getEnabledServicesFromSettings(getActivity()); AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
final boolean serviceEnabled = enabledServices.contains(componentName); final boolean serviceEnabled = enabledServices.contains(componentName);
@@ -146,8 +143,7 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
description = getString(R.string.accessibility_service_default_description); description = getString(R.string.accessibility_service_default_description);
} }
if (serviceEnabled && AccessibilityUtils.hasServiceCrashed( if (serviceEnabled && info.crashed) {
packageName, serviceInfo.name, enabledServiceInfos)) {
// Update the summaries for services that have crashed. // Update the summaries for services that have crashed.
description = getString(R.string.accessibility_description_state_stopped); description = getString(R.string.accessibility_description_state_stopped);
} }

5
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -332,8 +332,6 @@ public class AccessibilitySettings extends DashboardFragment {
List<AccessibilityServiceInfo> installedServices = List<AccessibilityServiceInfo> installedServices =
accessibilityManager.getInstalledAccessibilityServiceList(); accessibilityManager.getInstalledAccessibilityServiceList();
List<AccessibilityServiceInfo> enabledServiceInfos = accessibilityManager
.getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings( Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings(
getActivity()); getActivity());
List<String> permittedServices = mDpm.getPermittedAccessibilityServices( List<String> permittedServices = mDpm.getPermittedAccessibilityServices(
@@ -376,8 +374,7 @@ public class AccessibilitySettings extends DashboardFragment {
description = getString(R.string.accessibility_service_default_description); description = getString(R.string.accessibility_service_default_description);
} }
if (serviceEnabled && AccessibilityUtils.hasServiceCrashed( if (serviceEnabled && info.crashed) {
packageName, serviceInfo.name, enabledServiceInfos)) {
// Update the summaries for services that have crashed. // Update the summaries for services that have crashed.
preference.setSummary(R.string.accessibility_summary_state_stopped); preference.setSummary(R.string.accessibility_summary_state_stopped);
description = getString(R.string.accessibility_description_state_stopped); description = getString(R.string.accessibility_description_state_stopped);