diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java index ef255012b8707..b83d1d83f0363 100644 --- 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,