commit 763c9b2517deb303116d9fcbe68e82f012fb3d90
author Tony Wickham <twickham@google.com> Thu May 03 20:59:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 03 20:59:40 2018 +0000
tree 0ae3163d561d2710fa73f6be3efab1e584873619
parent 4f35687da9a7b5bfd5a1fc124a50358e9685d9a7
parent 43e671131c48462fa9de063b3ef847668fd6aca5

Merge changes from topic "am-a154d380-257c-43f3-8484-78ee3a3259b7" into ub-launcher3-master

* changes:
  [automerger] Don't crash if getWidth is 0 am: 181968b87b
  Don't crash if getWidth is 0

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4263654..160acb5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1160,15 +1160,18 @@
             onTaskLaunched(result);
             tv.setVisibility(VISIBLE);
             getOverlay().remove(drawable);
-            if (!result) {
-                tv.notifyTaskLaunchFailed(TAG);
-            }
         };
 
         mPendingAnimation = new PendingAnimation(anim);
         mPendingAnimation.addEndListener((onEndListener) -> {
             if (onEndListener.isSuccess) {
-                tv.launchTask(false, onTaskLaunchFinish, getHandler());
+                Consumer<Boolean> onLaunchResult = (result) -> {
+                    onTaskLaunchFinish.accept(result);
+                    if (!result) {
+                        tv.notifyTaskLaunchFailed(TAG);
+                    }
+                };
+                tv.launchTask(false, onLaunchResult, getHandler());
                 Task task = tv.getTask();
                 if (task != null) {
                     mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(