Merge "Fixes the issue Launcher state propagation is slower than onDeferredResume." into ub-launcher3-master

2020-07-08 00:27:35 +00:00
parent a3fff659cc 3bf889a02f
commit 4c40be975c
2 changed files with 9 additions and 1 deletions
@@ -157,6 +157,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
    @Override
    protected void onDeferredResumed() {
        super.onDeferredResumed();
+        handlePendingActivityRequest();
+    }
+
+    @Override
+    protected void handlePendingActivityRequest() {
+        super.handlePendingActivityRequest();
        if (mPendingActivityRequestCode != -1 && isInState(NORMAL)) {
            // Remove any active ProxyActivityStarter task and send RESULT_CANCELED to Launcher.
            onActivityResult(mPendingActivityRequestCode, RESULT_CANCELED, null);