commit 09a83089d40e0a6eac24b139f1bd14cc996e2588
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 16 01:31:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 16 01:31:44 2017 +0000
tree 78a7bc9ad922cf9286cea85f915e6b8419afba83
parent 447aaa447f47159de211bd43f42646a1c8ffe50f
parent 3871faacccbee0b975283c25e3d86b59dd144423

Merge "Fix NPE in requestKeyboardShortcuts"

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 0ea56b8..d370a63 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -62,7 +62,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settingslib.Utils;
 import com.android.systemui.R;
-import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.misc.SystemServicesProxy;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -371,7 +371,7 @@
 
     private void showKeyboardShortcuts(int deviceId) {
         retrieveKeyCharacterMap(deviceId);
-        Recents.getSystemServices().requestKeyboardShortcuts(mContext,
+        SystemServicesProxy.getInstance(mContext).requestKeyboardShortcuts(mContext,
                 new KeyboardShortcutsReceiver() {
                     @Override
                     public void onKeyboardShortcutsReceived(