diff options
| author | 2017-09-22 12:04:47 +0000 | |
|---|---|---|
| committer | 2017-09-22 12:04:47 +0000 | |
| commit | 3f7cd530cd72aaf4db6da99fdd436d55e63d8bc9 (patch) | |
| tree | 9594a49139746754a54f0890a18c1c9f17f2fd1c | |
| parent | c94d9d6bc450943f97821c65f646e2adef21bf2f (diff) | |
| parent | afb993f6071ece21e96caa1ed56ac57c81d9e7c6 (diff) | |
Merge "[Keyboard shortcuts] - fix NPE related to assist component"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java index d370a6331ea1..2d16d2209c9e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java @@ -433,24 +433,27 @@ public final class KeyboardShortcuts { // Assist. 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"); - } + // Not all devices have an assist component. + if (assistComponent != null) { + PackageInfo assistPackageInfo = 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( - assistPackageInfo.applicationInfo.packageName, - assistPackageInfo.applicationInfo.icon); + if (assistPackageInfo != null) { + final Icon assistIcon = Icon.createWithResource( + assistPackageInfo.applicationInfo.packageName, + assistPackageInfo.applicationInfo.icon); - keyboardShortcutInfoAppItems.add(new KeyboardShortcutInfo( - mContext.getString(R.string.keyboard_shortcut_group_applications_assist), - assistIcon, - KeyEvent.KEYCODE_UNKNOWN, - KeyEvent.META_META_ON)); + keyboardShortcutInfoAppItems.add(new KeyboardShortcutInfo( + mContext.getString(R.string.keyboard_shortcut_group_applications_assist), + assistIcon, + KeyEvent.KEYCODE_UNKNOWN, + KeyEvent.META_META_ON)); + } } // Browser. |