Snap for 5895720 from b85e199052 to rvc-release

Change-Id: Ic394392aa5f734bb72f5ba45b4c4667f283ce7f3
2019-09-24 03:10:36 +00:00
parent e836240cbb b85e199052
commit be24c2c8ec
1 changed files with 4 additions and 0 deletions
@@ -381,6 +381,10 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
            TaskView runningTaskView = recentsView.getRunningTaskView();
            if (runningTaskView == null) {
                runningTaskView = recentsView.getCurrentPageTaskView();
+                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();