commit 468e217cb4927a801523ad5fd00771ca8757b9aa
author Sunny Goyal <sunnygoyal@google.com> Tue Feb 16 22:39:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 16 22:39:44 2021 +0000
tree f0a747f942d78049da8b70c2b292dfe31f596662
parent 15622e032a11e9a908dd2902c5e840533e67ea09
parent e9110af0e087f1f69466240d6dd526ff152f087a

Merge "Fixing dragView not getting removed on returning home" into sc-dev am: e9110af0e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13563271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d273acda92d38afc50064645332278d6174e71

src/com/android/launcher3/statemanager/StatefulActivity.java

diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index 601e117..7abb653 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -150,8 +150,8 @@
 
     private void handleDeferredResume() {
         if (hasBeenResumed() && !getStateManager().getState().hasFlag(FLAG_NON_INTERACTIVE)) {
-            onDeferredResumed();
             addActivityFlags(ACTIVITY_STATE_DEFERRED_RESUMED);
+            onDeferredResumed();
 
             mDeferredResumePending = false;
         } else {