Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a83089 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in requestKeyboardShortcuts"

parents 447aaa44 3871faac

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

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import com.android.internal.logging.MetricsLogger; 
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 @@ public final class KeyboardShortcuts { 


    private void showKeyboardShortcuts(int deviceId) {

        retrieveKeyCharacterMap(deviceId);

        Recents.getSystemServices().requestKeyboardShortcuts(mContext,

        SystemServicesProxy.getInstance(mContext).requestKeyboardShortcuts(mContext,

                new KeyboardShortcutsReceiver() {

                    @Override

                    public void onKeyboardShortcutsReceived(