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

Commit d1f54203 authored by nyz93's avatar nyz93 Committed by Simon Shields
Browse files

Fix an error with hardware keyboard shortcuts 

Fixes the error which prevents keyboard shortcuts working when there is
no assistant application set up.

Change-Id: I2dd4af332ce58229e22007c154df4d38782d693a
parent e0f7c959

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

+7 −5
Original line number Diff line number Diff line
@@ -420,12 +420,14 @@ public final class KeyboardShortcuts { 
        final AssistUtils assistUtils = new AssistUtils(mContext);

        final ComponentName assistComponent = assistUtils.getAssistComponentForUser(userId);

        PackageInfo assistPackageInfo = null;

        if (assistComponent != null) {

            try {

                assistPackageInfo = mPackageManager.getPackageInfo(

                        assistComponent.getPackageName(), 0, userId);

            } catch (RemoteException e) {

                Log.e(TAG, "PackageManagerService is dead");

            }

        }



        if (assistPackageInfo != null) {

            final Icon assistIcon = Icon.createWithResource(