commit b8f722e7d29758947c34def36b9415cf9c4c7a36
author Tony Wickham <twickham@google.com> Mon Sep 23 15:44:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 23 15:44:27 2019 -0700
tree 87bc88c0eb8596bf90eda5e30ddd23595579c54e
parent 7f29c5caf39b4fa8071e835573db3eabea53c38a
parent d2d58656a4ac1da8580c3636a681f36cba0c1ba9

Don't crash when swiping up if there are no TaskViews
am: d2d58656a4

Change-Id: I251ffd2ad1103efe1313e52e05f8a027789312d4

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
index 25cc33d..36eb8a1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -381,6 +381,10 @@
             TaskView runningTaskView = recentsView.getRunningTaskView();
             if (runningTaskView == null) {
                 runningTaskView = recentsView.getTaskViewAt(recentsView.getCurrentPage());
+                if (runningTaskView == null) {
+                    // There are no task views in LockTask mode when Overview is enabled.
+                    return;
+                }
             }
             TimeInterpolator oldInterpolator = translateY.getInterpolator();
             Rect fallbackInsets = launcher.getDeviceProfile().getInsets();