| commit | f5911b9ba08081ce6fe8755d62bc454b026e5593 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Aug 25 18:59:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 25 18:59:08 2020 +0000 |
| tree | 5eed5b214046aa6d324a22339e273029737d3078 | |
| parent | 516da83f62046b86aa4a9478592986d63afd8e5e [diff] | |
| parent | c6890f886983eb6f87254157fea130074372f4e3 [diff] |
Fix Robolectric test breakage am: 77e29775a9 am: c6890f8869 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12442805 Change-Id: Id9fcbd568a485eae82af0429d574fa3ca080805d
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 8222918..cacd3fb 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java
@@ -927,6 +927,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;