From 318ef06316f70e39e2ddaea31aac739c5dac2198 Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Thu, 26 May 2016 11:16:12 +0100
Subject: [PATCH] Fix crash in Keyboard Shortcuts Helper logging

Bug: 28889634
Change-Id: Ib33ee0bf4d68916e132f0044f4f720db27e7187d
---
 .../src/com/android/systemui/statusbar/KeyboardShortcuts.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index 215fc346eac06..3df12cd6453cd 100644
--- 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;
             }