Merge "Fix NPE when trying to construct WorkspaceItemInfo with null intent data." into ub-launcher3-qt-qpr1-dev

am: 0e752faff4

Change-Id: I11fc10b79d83971d7eeb466a619f50fc3fd5a637
This commit is contained in:
Jonathan Miranda
2019-09-25 15:26:07 -07:00
committed by android-build-merger

View File

@@ -619,6 +619,11 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
}
private static WorkspaceItemInfo createWorkspaceItemInfo(Intent data, LauncherAppState app) {
if (data == null) {
Log.e(TAG, "Can't construct WorkspaceItemInfo with null data");
return null;
}
Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);