| commit | c6535c2ca4768a7493550b9507df2014ae6f880b | [log] [tgz] |
|---|---|---|
| author | Vinit Nayak <peanutbutter@google.com> | Mon Oct 18 23:52:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 18 23:52:25 2021 +0000 |
| tree | 151fd9ecfb79339eb0cc9cf8bdaa898c81496669 | |
| parent | dc0aa95242f9878e6720d3d14705b37865f3aa25 [diff] | |
| parent | 9cb63858a84a6162316dd376fd399bd390a0ba98 [diff] |
Merge "Ensure RecentsView RemoteTargetHandle's are non-null" into sc-v2-dev am: 6f6e97c653 am: 9cb63858a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16067210 Change-Id: I2d2566971847205d263e662a7587e7bb8b964e60
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java index 284bc03..12b071d 100644 --- a/quickstep/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -170,7 +170,7 @@ RemoteTargetHandle[] remoteTargetHandles; RemoteTargetHandle[] recentsViewHandles = recentsView.getRemoteTargetHandles(); - if (v.isRunningTask()) { + if (v.isRunningTask() && recentsViewHandles != null) { // Re-use existing handles remoteTargetHandles = recentsViewHandles; } else {