commit 4f35687da9a7b5bfd5a1fc124a50358e9685d9a7
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 20:37:36 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 20:37:36 2018 +0000
tree c6129276ab9fa23d388ff911c8723f4c9b39b371
parent 59c36cbb66e170e49ea0cb6ecd8e482158f3dd3e
parent 83f58f2d2cefa4e150175fc9d976c170453a03b8

[automerger] Fix incorrect reporting of launch failure am: 83f58f2d2c

Change-Id: I3befdb5851c1244d46ace72c73eb3281a306b6b5

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(