commit 318ef06316f70e39e2ddaea31aac739c5dac2198
author Clara Bayarri <clarabayarri@google.com> Thu May 26 11:16:12 2016 +0100
committer Clara Bayarri <clarabayarri@google.com> Thu May 26 11:16:12 2016 +0100
tree c38f8135915528d26bbd6844cfc1abdc0068c9ed
parent 7ec7c2b06a63d7946175e68aa9de353c62a37f0c

Fix crash in Keyboard Shortcuts Helper logging

Bug: 28889634
Change-Id: Ib33ee0bf4d68916e132f0044f4f720db27e7187d

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

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