Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev

This commit is contained in:
Winson Chung
2017-05-22 16:11:24 +00:00
committed by Android (Google) Code Review

View File

@@ -1063,7 +1063,6 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
| Intent.FLAG_ACTIVITY_TASK_ON_HOME);
Recents.getSystemServices().startActivityAsUserAsync(intent, opts);
HidePipMenuEvent hideMenuEvent = new HidePipMenuEvent();
hideMenuEvent.addPostAnimationCallback(() -> {
Recents.getSystemServices().startActivityAsUserAsync(intent, opts);