From d1f542035cb77018c051245035d5df79426b5f2c Mon Sep 17 00:00:00 2001 From: nyz93 Date: Sat, 13 May 2017 14:35:06 +0200 Subject: [PATCH] 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 --- .../com/android/systemui/statusbar/KeyboardShortcuts.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java index 016e1f2f5a98..9972d0d52b05 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java @@ -420,11 +420,13 @@ public final class KeyboardShortcuts { final AssistUtils assistUtils = new AssistUtils(mContext); final ComponentName assistComponent = assistUtils.getAssistComponentForUser(userId); PackageInfo assistPackageInfo = null; - try { - assistPackageInfo = mPackageManager.getPackageInfo( - assistComponent.getPackageName(), 0, userId); - } catch (RemoteException e) { - Log.e(TAG, "PackageManagerService is dead"); + if (assistComponent != null) { + try { + assistPackageInfo = mPackageManager.getPackageInfo( + assistComponent.getPackageName(), 0, userId); + } catch (RemoteException e) { + Log.e(TAG, "PackageManagerService is dead"); + } } if (assistPackageInfo != null) { -- 2.11.0