commit 6351eb4737e3346d95e4bbb3d72e977df5f8cd58
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 12 23:43:10 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 12 23:43:10 2020 +0000
tree ae4e6f28af50a34dc3af35423919c9456bcf58b0
parent 439beff8c42ba94ccca32f2d9aacfa3c516bd9db
parent 13890c08f73dd103409242c841eb390e8a7c15a6

Merge "Reset launcher on shortcutconfig activity minimize" into ub-launcher3-master

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 94ff63b..15503b8 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -167,7 +167,7 @@
     @Override
     public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
         if (requestCode != -1) {
-            mPendingActivityRequestCode = -1;
+            mPendingActivityRequestCode = requestCode;
             StartActivityParams params = new StartActivityParams(this, requestCode);
             params.intent = intent;
             params.options = options;