| commit | 75eab7fa160b56a0ae950711f3461520470f6674 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Mon May 22 16:20:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 22 16:20:18 2017 +0000 |
| tree | 1768f207d9bdd76ea7189ff503f11696acd7a3a0 | |
| parent | b8bcdf50e4b52f00c1c74afca776d483fe3fb6da [diff] | |
| parent | 305c332c2219878f009aefad4471d87f08359981 [diff] |
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev am: 305c332c22 Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index a903f38..e2e9b1b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
@@ -1063,7 +1063,6 @@ 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);