summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2018-04-27 16:12:54 -0700
committer Winson Chung <winsonc@google.com> 2018-04-27 17:43:11 -0700
commitbff1837ad28747f28db460977f00e47eb9f6021c (patch)
treece1d56bed3bbadfb51b901b8991e2193c8174315
parent594d6e9e22a64be3b69567433858e0a8624db36c (diff)
Allow the assistant activity types to be snapshotted
Bug: 78229855 Test: Swipe up with fullscreen assistant (ensure that retain_in_recents is enabled in AGSA first), see that there is a snapshot Change-Id: I6aee209add9838971c9476ef1ae1c88369291216
-rw-r--r--services/core/java/com/android/server/wm/TaskSnapshotController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index 6b13edd072cd..efc4e737b92c 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -317,7 +317,7 @@ class TaskSnapshotController {
@VisibleForTesting
int getSnapshotMode(Task task) {
final AppWindowToken topChild = task.getTopChild();
- if (!task.isActivityTypeStandardOrUndefined()) {
+ if (!task.isActivityTypeStandardOrUndefined() && !task.isActivityTypeAssistant()) {
return SNAPSHOT_MODE_NONE;
} else if (topChild != null && topChild.shouldUseAppThemeSnapshot()) {
return SNAPSHOT_MODE_APP_THEME;