Merge "Merge cherrypicks of ['android-review.googlesource.com/2762091', 'android-review.googlesource.com/2762649'] into sparse-10849083-L97700000963202018. SPARSE_CHANGE: Ib7f0cd7e234740cfdcf9b9d5713e37cae8fc68e4 SPARSE_CHANGE: I5ccd5093ee8c8f1fd5e86d3c1c934282b8fec10c" into sparse-10849083-L97700000963202018sparse-10849083-L97700000963202018

5 files changed, 17 insertions, 2 deletions

diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
index 584054169d0..035f34d7b42 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
@@ -121,6 +121,7 @@ class VersionChecker(val context: IrPluginContext) {
             10402 to "1.5.0",
             10403 to "1.5.1",
             10404 to "1.5.2",
+            10405 to "1.5.3",
         )
 
         /**
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt
index 5fee9add5f7..af60478273f 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt
@@ -28,5 +28,5 @@ internal object ComposeVersion {
      * IMPORTANT: Whenever updating this value, please make sure to also update `versionTable` and
      * `minimumRuntimeVersionInt` in `VersionChecker.kt` of the compiler.
      */
-    const val version: Int = 10404
+    const val version: Int = 10405
 }
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.android.kt
index 3ae949a4dc9..a457e51d356 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.android.kt
@@ -296,6 +296,7 @@ internal class TextInputServiceAndroid(
                 )
             }
         }
+        textInputCommandQueue.clear()
 
         // Now that we've calculated what operations we need to perform on the actual input
         // manager, perform them.
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt
index 4fd72dcaed6..362f71c5ea7 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt
@@ -256,6 +256,19 @@ class TextInputServiceAndroidCommandDebouncingTest {
         assertThat(inputMethodManager.showSoftInputCalls).isEqualTo(0)
     }
 
+    @Test
+    fun commandsAreCleared_afterProcessing() {
+        service.startInput()
+        scope.advanceUntilIdle()
+        assertThat(inputMethodManager.restartCalls).isEqualTo(1)
+        assertThat(inputMethodManager.showSoftInputCalls).isEqualTo(1)
+
+        service.showSoftwareKeyboard()
+        scope.advanceUntilIdle()
+        assertThat(inputMethodManager.restartCalls).isEqualTo(1) // does not increase
+        assertThat(inputMethodManager.showSoftInputCalls).isEqualTo(2)
+    }
+
     private fun TextInputServiceAndroid.startInput() {
         startInput(
             TextFieldValue(),
diff --git a/libraryversions.toml b/libraryversions.toml
index c8fc99a7003..6721a34d256 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -19,7 +19,7 @@ CAMERA_PIPE = "1.0.0-alpha01"
 CARDVIEW = "1.1.0-alpha01"
 CAR_APP = "1.4.0-alpha01"
 COLLECTION = "1.3.0-alpha05"
-COMPOSE = "1.5.2"
+COMPOSE = "1.5.3"
 COMPOSE_COMPILER = "1.4.7"
 COMPOSE_MATERIAL3 = "1.2.0-alpha02"
 COMPOSE_MATERIAL3_ADAPTIVE = "1.0.0-alpha01"