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

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

Merge "Flag removal: clear_shortcuts_when_activity_updates_to_service" into main

parents 954cfe91 7fba04ca

services/accessibility/accessibility.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -54,16 +54,6 @@ flag { 
    }

}



flag {

    name: "clear_shortcuts_when_activity_updates_to_service"

    namespace: "accessibility"

    description: "When an a11y activity is updated to an a11y service, clears the associated shortcuts so that we don't skip the AccessibilityServiceWarning."

    bug: "358092445"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "deprecate_package_list_observer"

    namespace: "accessibility"

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+9 −11
Original line number Diff line number Diff line
@@ -2600,7 +2600,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    private boolean readInstalledAccessibilityShortcutLocked(AccessibilityUserState userState,

            List<AccessibilityShortcutInfo> parsedAccessibilityShortcutInfos) {

        if (!parsedAccessibilityShortcutInfos.equals(userState.mInstalledShortcuts)) {

            if (Flags.clearShortcutsWhenActivityUpdatesToService()) {

            List<String> componentNames = userState.mInstalledShortcuts.stream()

                    .filter(a11yActivity ->

                            !parsedAccessibilityShortcutInfos.contains(a11yActivity))
@@ -2611,7 +2610,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                        /* enable= */ false, UserShortcutType.ALL,

                        componentNames, userState.mUserId);

            }

            }



            userState.mInstalledShortcuts.clear();

            userState.mInstalledShortcuts.addAll(parsedAccessibilityShortcutInfos);