Snap for 11405467 from bd93ec04c03f12df4592af08d52758ea0e32aa6f to mainline-os-statsd-release
Change-Id: I63db1ecbffa9b27444167b2f0395a7b367cc7449
diff --git a/Android.bp b/Android.bp
index 3c5ef19..cf8f548 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,7 +55,7 @@
enabled: false,
},
- kotlincflags: ["-Xjvm-default=enable"],
+ kotlincflags: ["-Xjvm-default=all"],
sdk_version: "current",
@@ -125,7 +125,7 @@
enabled: false,
},
- kotlincflags: ["-Xjvm-default=enable"],
+ kotlincflags: ["-Xjvm-default=all"],
privileged: true,
system_ext_specific: true,
diff --git a/src/com/android/wallpaper/model/CustomizationSectionController.kt b/src/com/android/wallpaper/model/CustomizationSectionController.kt
index 64de574..abfe2a9 100644
--- a/src/com/android/wallpaper/model/CustomizationSectionController.kt
+++ b/src/com/android/wallpaper/model/CustomizationSectionController.kt
@@ -52,7 +52,6 @@
* It means that the creation of the controller can be expensive and we should avoid recreation
* in conditions like the user switching between the home and lock screen.
*/
- @JvmDefault
fun shouldRetainInstanceWhenSwitchingTabs(): Boolean {
return false
}
@@ -66,7 +65,6 @@
* @param context The [Context] to inflate view.
* @param params Parameters for the creation of the view.
*/
- @JvmDefault
fun createView(context: Context, params: ViewCreationParams): T {
return createView(context)
}
@@ -79,11 +77,11 @@
fun createView(context: Context): T
/** Saves the view state for configuration changes. */
- @JvmDefault fun onSaveInstanceState(savedInstanceState: Bundle) = Unit
+ fun onSaveInstanceState(savedInstanceState: Bundle) = Unit
/** Releases the controller. */
- @JvmDefault fun release() = Unit
+ fun release() = Unit
/** Gets called when the section gets transitioned out. */
- @JvmDefault fun onTransitionOut() = Unit
+ fun onTransitionOut() = Unit
}
