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

Commit 61e7f37b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unrestrict granted ECM setting for A11Y" into main

parents b2944f3e bfedd950

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class RestrictedPreferenceHelper { 
                && android.security.Flags.extendEcmToAllSettings()) {

            preference.checkEcmRestrictionAndSetDisabled(

                    AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE,

                    preference.getPackageName());

                    preference.getPackageName(), serviceEnabled);

            if (preference.isDisabledByEcm()) {

                serviceAllowed = false;

            }

src/com/android/settings/widget/RestrictedAppPreference.java

+3 −2
Original line number Diff line number Diff line
@@ -136,11 +136,12 @@ public class RestrictedAppPreference extends AppPreference implements 
    /**

     * Checks if the given setting is subject to Enhanced Confirmation Mode restrictions for this

     * package. Marks the preference as disabled if so.

     * TODO b/390196024: remove this and update all callers to use the "settingEnabled" version

     * @param settingIdentifier The key identifying the setting

     * @param packageName the package to check the settingIdentifier for

     */

    public void checkEcmRestrictionAndSetDisabled(@NonNull String settingIdentifier,

            @NonNull String packageName) {

        mHelper.checkEcmRestrictionAndSetDisabled(settingIdentifier, packageName);

        mHelper.checkEcmRestrictionAndSetDisabled(settingIdentifier, packageName, false);

    }

}