Merge "Remove enabled flag cache_window_style" into main (0fc61826) · Commits · e / os / android_frameworks_base

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

+0 −11

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

		flag {
		name: "cache_window_style"
		namespace: "windowing_frontend"
		description: "Cache common window styles"
		bug: "350394503"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "respect_hierarchy_surface_visibility"
		namespace: "windowing_frontend"

+0 −11

Original line number	Diff line number	Diff line
		@@ -5625,11 +5625,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

		@Nullable
		ActivityRecord.WindowStyle getWindowStyle(String packageName, int theme, int userId) {
		if (!com.android.window.flags.Flags.cacheWindowStyle()) {
		final AttributeCache.Entry ent = AttributeCache.instance().get(packageName,
		theme, com.android.internal.R.styleable.Window, userId);
		return ent != null ? new ActivityRecord.WindowStyle(ent.array) : null;
		}
		return mWindowStyleCache.get(packageName, theme, userId);
		}

		@@ -7441,12 +7436,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

		@Override
		public boolean isNoDisplay(String packageName, int theme, int userId) {
		if (!com.android.window.flags.Flags.cacheWindowStyle()) {
		final AttributeCache.Entry ent = AttributeCache.instance()
		.get(packageName, theme, R.styleable.Window, userId);
		return ent != null
		&& ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false);
		}
		final ActivityRecord.WindowStyle style = getWindowStyle(packageName, theme, userId);
		return style != null && style.noDisplay();
		}