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

Commit b89afc2b authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Pre-emptively take a snapshot when finishing an activity before... 

Merge "Pre-emptively take a snapshot when finishing an activity before changing visibility" into qt-r1-dev am: 6836e6d0
am: c3593d78

Change-Id: Id7c76d6ce508626b328039030ff6410531d6608a
parents 9a32fb38 c3593d78

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

+10 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ import com.android.server.am.AppTimeTracker; 
import com.android.server.am.EventLogTags;

import com.android.server.am.PendingIntentRecord;



import com.google.android.collect.Sets;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.ref.WeakReference;
@@ -4031,6 +4033,14 @@ class ActivityStack extends ConfigurationContainer { 
                }

                getDisplay().mDisplayContent.prepareAppTransition(transit, false);



                // When finishing the activity pre-emptively take the snapshot before the app window

                // is marked as hidden and any configuration changes take place

                if (mWindowManager.mTaskSnapshotController != null) {

                    final ArraySet<Task> tasks = Sets.newArraySet(task.mTask);

                    mWindowManager.mTaskSnapshotController.snapshotTasks(tasks);

                    mWindowManager.mTaskSnapshotController.addSkipClosingAppSnapshotTasks(tasks);

                }



                // Tell window manager to prepare for this one to be removed.

                r.setVisibility(false);