From 07df5fd03a71bbe74c9b3fe6a5940f7a9f20f46a Mon Sep 17 00:00:00 2001
From: davidliu <davidliu@deviange.net>
Date: Mon, 8 Sep 2025 19:59:47 +0900
Subject: [PATCH] Remove unneeded suspend modifier from registerRpcMethod

---
 .changeset/fifty-pans-explain.md                             | 5 +++++
 .../src/main/java/io/livekit/android/room/Room.kt            | 2 +-
 .../io/livekit/android/room/participant/LocalParticipant.kt  | 2 +-
 .../src/main/java/io/livekit/android/room/rpc/RpcManager.kt  | 3 +--
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/fifty-pans-explain.md

diff --git a/.changeset/fifty-pans-explain.md b/.changeset/fifty-pans-explain.md
new file mode 100644
index 000000000..644af150a
--- /dev/null
+++ b/.changeset/fifty-pans-explain.md
@@ -0,0 +1,5 @@
+---
+"client-sdk-android": patch
+---
+
+Remove unneeded suspend modifier from registerRpcMethod
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
index 623c54681..69b31f909 100644
--- a/livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
+++ b/livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
@@ -1103,7 +1103,7 @@ constructor(
     )
 
     // ----------------------------------- RpcManager ------------------------------------//
-    override suspend fun registerRpcMethod(method: String, handler: RpcHandler) {
+    override fun registerRpcMethod(method: String, handler: RpcHandler) {
         localParticipant.registerRpcMethod(method, handler)
     }
 
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/participant/LocalParticipant.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/participant/LocalParticipant.kt
index f6ee22c5f..2b53e01eb 100644
--- a/livekit-android-sdk/src/main/java/io/livekit/android/room/participant/LocalParticipant.kt
+++ b/livekit-android-sdk/src/main/java/io/livekit/android/room/participant/LocalParticipant.kt
@@ -1028,7 +1028,7 @@ internal constructor(
      * @see RpcInvocationData
      * @see performRpc
      */
-    override suspend fun registerRpcMethod(
+    override fun registerRpcMethod(
         method: String,
         handler: RpcHandler,
     ) {
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/rpc/RpcManager.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/rpc/RpcManager.kt
index 22e2f9d3e..b8c5b2a7c 100644
--- a/livekit-android-sdk/src/main/java/io/livekit/android/room/rpc/RpcManager.kt
+++ b/livekit-android-sdk/src/main/java/io/livekit/android/room/rpc/RpcManager.kt
@@ -61,8 +61,7 @@ interface RpcManager {
      * @see RpcInvocationData
      * @see performRpc
      */
-    @Suppress("RedundantSuspendModifier")
-    suspend fun registerRpcMethod(
+    fun registerRpcMethod(
         method: String,
         handler: RpcHandler,
     )