Merge "Fix KeyboardShortcuts show"

2017-01-09 22:05:20 +00:00
parent 9096948a1c 1a0f36f42d
commit d06030c515
1 changed files with 6 additions and 1 deletions
--- 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);
    }