Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-22 12:04:47 +00:00
committed by Android (Google) Code Review
parent c94d9d6bc4 afb993f607
commit 3f7cd530cd
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
View File

@@ -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.