Merge "Cleanup no_consecutive_visibility_events flag" into main (10c6cf63) · Commits · e / os / android_frameworks_base

core/java/android/service/wallpaper/WallpaperService.java

+4 −22

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
		import static android.view.flags.Flags.disableDrawWakeLock;

		import static com.android.window.flags.Flags.FLAG_OFFLOAD_COLOR_EXTRACTION;
		import static com.android.window.flags.Flags.noConsecutiveVisibilityEvents;
		import static com.android.window.flags.Flags.offloadColorExtraction;

		import android.animation.AnimationHandler;
		@@ -1523,7 +1522,6 @@ public abstract class WallpaperService extends Service {
		// Trigger onVisibilityChanged(true) then onVisibilityChanged(false)
		// to make sure the wallpaper is stopped even after the events
		// onSurfaceCreated() and onSurfaceChanged().
		if (noConsecutiveVisibilityEvents()) {
		if (DEBUG) Log.v(TAG, "toggling onVisibilityChanged");
		Trace.beginSection("WPMS.Engine.onVisibilityChanged-true");
		onVisibilityChanged(true);
		@@ -1531,22 +1529,6 @@ public abstract class WallpaperService extends Service {
		Trace.beginSection("WPMS.Engine.onVisibilityChanged-false");
		onVisibilityChanged(false);
		Trace.endSection();
		} else {
		if (DEBUG) {
		Log.v(TAG, "onVisibilityChanged(true) at surface: " + this);
		}
		Trace.beginSection("WPMS.Engine.onVisibilityChanged-true");
		onVisibilityChanged(true);
		Trace.endSection();
		}
		}
		if (!noConsecutiveVisibilityEvents()) {
		if (DEBUG) {
		Log.v(TAG, "onVisibilityChanged(false) at surface: " + this);
		}
		Trace.beginSection("WPMS.Engine.onVisibilityChanged-false");
		onVisibilityChanged(false);
		Trace.endSection();
		}
		}
		} finally {

+0 −7

Original line number	Diff line number	Diff line
		@@ -17,13 +17,6 @@ flag {
		is_exported: true
		}

		flag {
		name: "no_consecutive_visibility_events"
		namespace: "systemui"
		description: "Prevent the system from sending consecutive onVisibilityChanged(false) events."
		bug: "285631818"
		}

		flag {
		name: "offload_color_extraction"
		namespace: "systemui"