Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault"... (ef56d22d) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ android_library {
		// *.kt sources are inside a filegroup.
		"kotlin-annotations",
		],
		kotlincflags: ["-Xjvm-default=enable"],
		kotlincflags: ["-Xjvm-default=all"],
		manifest: "AndroidManifest.xml",
		plugins: ["dagger2-compiler"],
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ class FloatingContentCoordinator constructor() {
		* non-overlapping.
		* @return The new bounds for this content.
		*/
		@JvmDefault
		fun calculateNewBoundsOnOverlap(
		overlappingContentBounds: Rect,
		otherContentBounds: List<Rect>

+1 −4

Original line number	Diff line number	Diff line
		@@ -368,7 +368,6 @@ class DesktopModeTaskRepository {
		/**
		* Called when the active tasks change in desktop mode.
		*/
		@JvmDefault
		fun onActiveTasksChanged(displayId: Int) {}
		}

		@@ -379,13 +378,11 @@ class DesktopModeTaskRepository {
		/**
		* Called when the desktop starts or stops showing freeform tasks.
		*/
		@JvmDefault
		fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) {}

		/**
		* Called when the desktop stashed status changes.
		*/
		@JvmDefault
		fun onStashedChanged(displayId: Int, stashed: Boolean) {}
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ android_test {
		"libstaticjvmtiagent",
		],

		kotlincflags: ["-Xjvm-default=enable"],
		kotlincflags: ["-Xjvm-default=all"],

		plugins: ["dagger2-compiler"],

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ android_app {
		platform_apis: true,
		privileged: true,

		kotlincflags: ["-Xjvm-default=enable"],
		kotlincflags: ["-Xjvm-default=all"],

		optimize: {
		proguard_compatibility: false,