Merge "Update the `shouldExecute` API to match proposed code generation." into androidx-main
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
index dffb7ff..0c5d73d 100644
--- a/compose/runtime/runtime/api/current.txt
+++ b/compose/runtime/runtime/api/current.txt
@@ -151,7 +151,7 @@
method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public void recordSideEffect(kotlin.jvm.functions.Function0 effect);
method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public void recordUsed(androidx.compose.runtime.RecomposeScope scope);
method @androidx.compose.runtime.ComposeCompilerApi public Object? rememberedValue();
- method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public boolean shouldExecute(boolean parametersChanged);
+ method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public boolean shouldExecute(boolean parametersChanged, int flags);
method @androidx.compose.runtime.ComposeCompilerApi public void skipCurrentGroup();
method @androidx.compose.runtime.ComposeCompilerApi public void skipToGroupEnd();
method public void sourceInformation(String sourceInformation);
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
index 9c343f0..11909a2 100644
--- a/compose/runtime/runtime/api/restricted_current.txt
+++ b/compose/runtime/runtime/api/restricted_current.txt
@@ -156,7 +156,7 @@
method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public void recordSideEffect(kotlin.jvm.functions.Function0 effect);
method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public void recordUsed(androidx.compose.runtime.RecomposeScope scope);
method @androidx.compose.runtime.ComposeCompilerApi public Object? rememberedValue();
- method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public boolean shouldExecute(boolean parametersChanged);
+ method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public boolean shouldExecute(boolean parametersChanged, int flags);
method @androidx.compose.runtime.ComposeCompilerApi public void skipCurrentGroup();
method @androidx.compose.runtime.ComposeCompilerApi public void skipToGroupEnd();
method public void sourceInformation(String sourceInformation);
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
index 0e48726..28f2850 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
@@ -985,7 +985,7 @@
* execute (such as its scope was invalidated or a static composition local it was changed) or
* the composition is pausable and the composition is pausing.
*/
- @InternalComposeApi fun shouldExecute(parametersChanged: Boolean): Boolean
+ @InternalComposeApi fun shouldExecute(parametersChanged: Boolean, flags: Int): Boolean
// Internal API
@@ -3038,7 +3038,8 @@
}
@ComposeCompilerApi
- override fun shouldExecute(parametersChanged: Boolean): Boolean {
+ @Suppress("UNUSED")
+ override fun shouldExecute(parametersChanged: Boolean, flags: Int): Boolean {
return parametersChanged || !skipping
}
