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

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

Merge "[Keyboard shortcuts] - fix NPE related to assist component"

parents c94d9d6b afb993f6

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

+19 −16
Original line number Diff line number Diff line
@@ -433,6 +433,8 @@ public final class KeyboardShortcuts { 
        // Assist.

        final AssistUtils assistUtils = new AssistUtils(mContext);

        final ComponentName assistComponent = assistUtils.getAssistComponentForUser(userId);

        // Not all devices have an assist component.

        if (assistComponent != null) {

            PackageInfo assistPackageInfo = null;

            try {

                assistPackageInfo = mPackageManager.getPackageInfo(
@@ -452,6 +454,7 @@ public final class KeyboardShortcuts { 
                        KeyEvent.KEYCODE_UNKNOWN,

                        KeyEvent.META_META_ON));

            }

        }



        // Browser.

        final Icon browserIcon = getIconForIntentCategory(Intent.CATEGORY_APP_BROWSER, userId);