Merge "Clean up safe_release_snapshot_aggressively flag" into main (7ce45d05) · Commits · e / os / android_frameworks_base

core/java/android/window/TaskSnapshot.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ import android.util.DisplayMetrics;
		import android.view.Surface;
		import android.view.WindowInsetsController;

		import com.android.window.flags.Flags;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.function.Consumer;
		@@ -410,9 +408,6 @@ public class TaskSnapshot implements Parcelable {
		* Only used in core.
		*/
		public synchronized void setSafeRelease(Consumer<HardwareBuffer> releaser) {
		if (!Flags.safeReleaseSnapshotAggressively()) {
		return;
		}
		mSafeSnapshotReleaser = releaser;
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -329,17 +329,6 @@ flag {
		}
		}

		flag {
		name: "safe_release_snapshot_aggressively"
		namespace: "windowing_frontend"
		description: "Protect task snapshot memory from premature release, which can occur when a local variable holds a reference while the snapshot is removed from the cache."
		bug: "238206323"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "scramble_snapshot_file_name"
		namespace: "windowing_frontend"