Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4072d431 authored by Cam Bickel's avatar Cam Bickel Committed by Camden Bickel
Browse files

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
parent 8eee5a48

src/com/android/settings/accessibility/RestrictedPreferenceHelper.java

+3 −12
Original line number Diff line number Diff line
@@ -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);

            }

            preferenceList.add(preference);

        }

        return preferenceList;

tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java

+0 −18
Original line number Diff line number Diff line
@@ -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<AccessibilityActivityPreference> 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);