Merge "Always capture activity snapshot regardless predictive back status..." into main (31b47abb) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -246,3 +246,14 @@ flag {
	purpose: PURPOSE_BUGFIX		purpose: PURPOSE_BUGFIX
	}		}
	}		}

			flag {
			name: "always_capture_activity_snapshot"
			namespace: "windowing_frontend"
			description: "Always capture activity snapshot regardless predictive back status"
			bug: "362183912"
			is_fixed_read_only: true
			metadata {
			purpose: PURPOSE_BUGFIX
			}
			}
			No newline at end of file

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,8 @@ import android.util.ArrayMap;
	import android.view.WindowManager;		import android.view.WindowManager;
	import android.window.TaskSnapshot;		import android.window.TaskSnapshot;

			import com.android.window.flags.Flags;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;

	@@ -150,6 +152,9 @@ class SnapshotController {
	if (mOpenActivities.isEmpty()) {		if (mOpenActivities.isEmpty()) {
	return false;		return false;
	}		}
			if (Flags.alwaysCaptureActivitySnapshot()) {
			return true;
			}
	for (int i = mOpenActivities.size() - 1; i >= 0; --i) {		for (int i = mOpenActivities.size() - 1; i >= 0; --i) {
	if (!mOpenActivities.get(i).mOptInOnBackInvoked) {		if (!mOpenActivities.get(i).mOptInOnBackInvoked) {
	return false;		return false;