diff --git a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java index c324130bb3a..82aa0984a0b 100644 --- a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java +++ b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java @@ -110,10 +110,6 @@ public class RestrictedPreferenceHelper { */ public List createAccessibilityActivityPreferenceList( List installedShortcuts) { - final Set enabledServices = - AccessibilityUtils.getEnabledServicesFromSettings(mContext); - final List permittedServices = mDpm.getPermittedAccessibilityServices( - UserHandle.myUserId()); final int installedShortcutsSize = installedShortcuts.size(); final List 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; diff --git a/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java b/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java index 2a41e62e7ae..4eda58ebaf2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java @@ -31,7 +31,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; -import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; @@ -141,27 +140,10 @@ public class RestrictedPreferenceHelperTest { assertThat(preference.getKey()).isEqualTo(key); } - @Test - @EnableFlags(value = {android.security.Flags.FLAG_EXTEND_ECM_TO_ALL_SETTINGS, - android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED}) - @DisableFlags(Flags.FLAG_NEVER_RESTRICT_ACCESSIBILITY_ACTIVITY) - public void createAccessibilityActivityPreference_ecmRestricted_prefIsEcmRestricted() { - setMockAccessibilityShortcutInfo(mShortcutInfo); - ShadowRestrictedLockUtilsInternal.setEcmRestrictedPkgs(PACKAGE_NAME); - - final List preferenceList = - mHelper.createAccessibilityActivityPreferenceList(List.of(mShortcutInfo)); - assertThat(preferenceList).hasSize(1); - final RestrictedPreference preference = preferenceList.get(0); - - assertThat(preference.isDisabledByEcm()).isTrue(); - } - @Test @EnableFlags(value = { android.security.Flags.FLAG_EXTEND_ECM_TO_ALL_SETTINGS, android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED, - Flags.FLAG_NEVER_RESTRICT_ACCESSIBILITY_ACTIVITY, }) public void createAccessibilityActivityPreference_ecmRestricted_prefIsNotEcmRestricted() { setMockAccessibilityShortcutInfo(mShortcutInfo);