commit | 25e61b260691f5c0f3b7c436305c7690ecff9395 | [log] [tgz] |
---|---|---|
author | Vinit Nayak <peanutbutter@google.com> | Thu Feb 10 00:01:19 2022 +0000 |
committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Thu Feb 10 00:01:19 2022 +0000 |
tree | 1671c58e118400eede505d54fc5b84cfc6160ef7 | |
parent | bc4b55f97d50acae8d9c9ebdb5552f15c04e1fe5 [diff] | |
parent | 73c6288038c05d8e1c692e4027927e4fd6452fd7 [diff] |
[automerge] Add null check for null task in getItemInfo() 2p: 73c6288038 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919 Change-Id: I205452840d664917ad1b61d3daec717f211a8ef2
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 6a2c997..d046fef 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -462,11 +462,15 @@ return getItemInfo(mTask); } - protected WorkspaceItemInfo getItemInfo(Task task) { - ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(task.key); + protected WorkspaceItemInfo getItemInfo(@Nullable Task task) { WorkspaceItemInfo stubInfo = new WorkspaceItemInfo(); stubInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK; stubInfo.container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER; + if (task == null) { + return stubInfo; + } + + ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(task.key); stubInfo.user = componentKey.user; stubInfo.intent = new Intent().setComponent(componentKey.componentName); stubInfo.title = task.title;