commit | 1af0e4d22e51e70787cd97310b4c48a763b4c3b0 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jan 07 22:53:42 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 22:53:42 2022 +0000 |
tree | 212f00828bc1c3e80060a165c56f4f5ff136a44a | |
parent | 27981bac2aa4c8c1a627e9ea1760d499fd07b86a [diff] | |
parent | 5bab8365b41eea957ff84a0bb571fb76814764af [diff] |
Merge "Add null check when logging quick switch" into sc-v2-dev am: d873788275 am: 5bab8365b4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16584901 Change-Id: I17f59874f884bf3b7c0e1d154d8d9ac8f9fa1b5c
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 1d8a459..3e0eb91 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -470,7 +470,9 @@ stubInfo.user = componentKey.user; stubInfo.intent = new Intent().setComponent(componentKey.componentName); stubInfo.title = task.title; - stubInfo.screenId = getRecentsView().indexOfChild(this); + if (getRecentsView() != null) { + stubInfo.screenId = getRecentsView().indexOfChild(this); + } return stubInfo; }