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

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

Cleanup flag "clear_default_from_a11y_shortcut..." 

Full flag name:
"clear_default_from_a11y_shortcut_target_service_restore"

Bug: b/341374402
Test: atest AccessibilityManagerServiceTest
Flag: EXEMPT flag cleanup
Change-Id: I2e47cd13305e121d8002eae17410c21b27462d29
parent 40c99aa5

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

+1 −2
Original line number Diff line number Diff line
@@ -2269,8 +2269,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                            mContext, shortcutType, userState.mUserId))

                    : userState.getShortcutTargetsLocked(shortcutType);



            if (Flags.clearDefaultFromA11yShortcutTargetServiceRestore()

                    && shortcutType == HARDWARE) {

            if (shortcutType == HARDWARE) {

                final String defaultService =

                        mContext.getString(R.string.config_defaultAccessibilityService);

                final ComponentName defaultServiceComponent = TextUtils.isEmpty(defaultService)

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java

+3 −9
Original line number Diff line number Diff line
@@ -1818,9 +1818,7 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags({

            android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE,

            Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE})

    @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)

    public void restoreShortcutTargets_hardware_alreadyHadDefaultService_doesNotClear() {

        final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;

        mTestableContext.getOrCreateTestableResources().addOverride(
@@ -1846,9 +1844,7 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags({

            android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE,

            Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE})

    @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)

    public void restoreShortcutTargets_hardware_didNotHaveDefaultService_clearsDefaultService() {

        final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;

        final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
@@ -1873,9 +1869,7 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags({

            android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE,

            Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE})

    @EnableFlags(Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE)

    public void restoreShortcutTargets_hardware_nullSetting_clearsDefaultService() {

        final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;

        final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();