diff options
2 files changed, 5 insertions, 8 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index d4af7b765254..c210e726fc12 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -4503,13 +4503,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } if (shortcutType == HARDWARE) { skipVolumeShortcutDialogTimeoutRestriction(userId); - if (com.android.server.accessibility.Flags.enableHardwareShortcutDisablesWarning()) { - persistIntToSetting( - userId, - Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, - AccessibilityShortcutController.DialogStatus.SHOWN - ); - } + persistIntToSetting( + userId, + Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, + AccessibilityShortcutController.DialogStatus.SHOWN + ); } else if (shortcutType == SOFTWARE) { // Update the A11y FAB size to large when the Magnification shortcut is // enabled and the user hasn't changed the floating button size diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index d5b930769e43..492838e9b4fb 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -1136,7 +1136,6 @@ public class AccessibilityManagerServiceTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_HARDWARE_SHORTCUT_DISABLES_WARNING) public void enableHardwareShortcutsForTargets_shortcutDialogSetting_isShown() { // TODO(b/111889696): Remove the user 0 assumption once we support multi-user assumeTrue("The test is setup to run as a user 0", |