diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java index f43fc4065766e..bd5fb923cb840 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java @@ -381,7 +381,12 @@ public final class KeyboardShortcuts { if (appShortcuts != null) { result.add(appShortcuts); } - showKeyboardShortcutsDialog(result); + synchronized (sLock) { + // showKeyboardShortcutsDialog only if it has not been dismissed already + if (sInstance != null) { + showKeyboardShortcutsDialog(result); + } + } } }, deviceId); }