Merge "Fix crash in Keyboard Shortcuts Helper logging"

2016-05-26 13:07:29 +00:00
parent 57ce118736 318ef06316
commit 677b466ad8
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -151,10 +151,10 @@ public final class KeyboardShortcuts {
    }

    public static void dismiss() {
-        MetricsLogger.hidden(sInstance.mContext,
-                MetricsProto.MetricsEvent.KEYBOARD_SHORTCUTS_HELPER);
        synchronized (sLock) {
            if (sInstance != null) {
+                MetricsLogger.hidden(sInstance.mContext,
+                        MetricsProto.MetricsEvent.KEYBOARD_SHORTCUTS_HELPER);
                sInstance.dismissKeyboardShortcuts();
                sInstance = null;
            }