Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab15d009 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Allow the assistant activity types to be snapshotted" into pi-dev 

am: 8512aa4d

Change-Id: Ib46302f295ccc201f70875df3334bd8b04d2fb07
parents d82a8af0 8512aa4d

services/core/java/com/android/server/wm/TaskSnapshotController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;