Merge "[Flag Removal] Remove flag androidx.window.sidecar.flags.merge_extensions_sidecar" into main (05d5dc6c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/Android.bp

+0 −13

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ java_library {
		],
		static_libs: [
		"window-sidecar",
		"aconfig_androidx_window_sidecar_flags_lib",
		"androidx.window.extensions",
		],
		installable: true,
		@@ -58,18 +57,6 @@ prebuilt_etc {
		filename_from_src: true,
		}

		aconfig_declarations {
		name: "sidecar_flags",
		package: "androidx.window.sidecar.flags",
		container: "system",
		srcs: ["src/androidx/window/sidecar/flags/sidecar_flags.aconfig"],
		}

		java_aconfig_library {
		name: "aconfig_androidx_window_sidecar_flags_lib",
		aconfig_declarations: "sidecar_flags",
		}

		// Extensions
		java_library {
		name: "androidx.window.extensions",

+5 −10

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package androidx.window.sidecar;

		import static androidx.window.sidecar.flags.Flags.mergeExtensionsSidecar;

		import android.content.Context;
		import android.hardware.devicestate.DeviceStateManager;
		@@ -50,15 +49,11 @@ public class SidecarProvider {
		}

		private static SidecarInterface getSidecarInterface(Context context) {
		if (mergeExtensionsSidecar()) {
		WindowLayoutComponent windowLayoutComponent = WindowExtensionsProvider
		.getWindowExtensions()
		.getWindowLayoutComponent();
		DeviceStateManager deviceStateManager = getDeviceStateManager(context);
		return new SidecarExtensionsImpl(windowLayoutComponent, deviceStateManager);
		} else {
		return new SidecarImpl(context.getApplicationContext());
		}
		}

		@NonNull

+0 −12

Original line number	Diff line number	Diff line
		package: "androidx.window.sidecar.flags"
		container: "system"

		flag {
		name: "merge_extensions_sidecar"
		namespace: "windowing_sdk"
		description: "Update Sidecar to be backed by Extensions."
		bug: "347964255"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}