| commit | c6890f886983eb6f87254157fea130074372f4e3 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Aug 25 18:19:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 25 18:19:20 2020 +0000 |
| tree | 5d922c294f0378b20ecc85dcf1d30b57d1176826 | |
| parent | ba9717199f936bc05c89b69a88c16e56a0c292b1 [diff] | |
| parent | 77e29775a9e9fd98a3905130dad0c15ead9edfa4 [diff] |
Fix Robolectric test breakage am: 77e29775a9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12442805 Change-Id: Ib8711dce31cc2bbb54776939a402440521b09c5f
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 03e4b06..dede954 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java
@@ -929,6 +929,7 @@ protected void handlePendingActivityRequest() { } private void logStopAndResume(int command) { + if (mPendingExecutor != null) return; int pageIndex = mWorkspace.isOverlayShown() ? -1 : mWorkspace.getCurrentPage(); int containerType = mStateManager.getState().containerType;