From ec0569c12e144d9b53542180d5015c4a6dbe84bf Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Mon, 23 Nov 2020 11:36:38 +0000
Subject: [PATCH] Resume app switching if activity is start from recent

If app is started from recent, it doesn't go to regular startActivity
path, but it should still resume app switching feature.

Bug: 173509909
Test: atest ActivityStarterTests
Test: In gesture navigation mode, switch between apps, can see the
resume app swithcing api is called and apps are able to start activities
successfully.
Change-Id: I0c2e2d9083d48401c9e00159edb49ed8268a8248
---
 .../java/com/android/server/wm/ActivityTaskSupervisor.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
index 37f04cec071bf..6d0030567dcf2 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
@@ -2562,6 +2562,11 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
                 mService.getActivityStartController().postStartActivityProcessingForLastStarter(
                         task.getTopNonFinishingActivity(), ActivityManager.START_TASK_TO_FRONT,
                         task.getRootTask());
+
+                // As it doesn't go to ActivityStarter.executeRequest() path, we need to resume
+                // app switching here also.
+                mService.resumeAppSwitches();
+
                 return ActivityManager.START_TASK_TO_FRONT;
             }
             callingPackage = task.mCallingPackage;