Cleanup flag "never_restrict_a11y_activity"

Full flag name: "never_restrict_accessibility_activity"

Bug: b/331990900
Test: atest RestrictedPreferenceHelperTest
Flag: EXEMPT flag cleanup
Change-Id: I365ed105043cb4835075b8b9016b41862f82021c
This commit is contained in:
Cam Bickel
2024-11-21 23:16:32 +00:00
committed by Camden Bickel
parent 8eee5a480d
commit 4072d43123
2 changed files with 3 additions and 30 deletions

View File

@@ -110,10 +110,6 @@ public class RestrictedPreferenceHelper {
*/
public List<AccessibilityActivityPreference> createAccessibilityActivityPreferenceList(
List<AccessibilityShortcutInfo> installedShortcuts) {
final Set<ComponentName> enabledServices =
AccessibilityUtils.getEnabledServicesFromSettings(mContext);
final List<String> permittedServices = mDpm.getPermittedAccessibilityServices(
UserHandle.myUserId());
final int installedShortcutsSize = installedShortcuts.size();
final List<AccessibilityActivityPreference> preferenceList = new ArrayList<>(
@@ -124,17 +120,12 @@ public class RestrictedPreferenceHelper {
final ActivityInfo activityInfo = info.getActivityInfo();
final ComponentName componentName = info.getComponentName();
final boolean serviceEnabled = enabledServices.contains(componentName);
AccessibilityActivityPreference preference = new AccessibilityActivityPreference(
mContext, componentName.getPackageName(), activityInfo.applicationInfo.uid,
info);
if (Flags.neverRestrictAccessibilityActivity()) {
// Accessibility Activities do not have elevated privileges so restricting
// them based on ECM or device admin does not give any value.
preference.setEnabled(true);
} else {
setRestrictedPreferenceEnabled(preference, permittedServices, serviceEnabled);
}
// Accessibility Activities do not have elevated privileges so restricting
// them based on ECM or device admin does not give any value.
preference.setEnabled(true);
preferenceList.add(preference);
}
return preferenceList;