Merge "Do not disable the default shortcut at the end of setup."

2023-02-22 06:44:25 +00:00
parent eda02382b8 c13d2ac160
commit 1cf487b85f
1 changed files with 5 additions and 0 deletions
--- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
+++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
@@ -650,6 +650,11 @@ public class AccessibilityShortcutController {
         *
         */
        private void setEmptyShortcutTargetIfNeeded() {
+            if (hasFeatureLeanback()) {
+                // Do not disable the default shortcut on TV.
+                return;
+            }
+
            final ContentResolver contentResolver = mContext.getContentResolver();

            final String shortcutTargets = Settings.Secure.getStringForUser(contentResolver,