Eliminate some redundant synchronization on Android

* java/org/gnu/emacs/EmacsService.java (resetIC): Return on all
versions of Android if the connection need not be reset.

* java/org/gnu/emacs/EmacsView.java (getICMode, setICMode):
Remove needless synchronization.

(cherry picked from commit 677f082b0feda295e6a710b5dac6040f57cfad8b)

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 2dcaad16e50b1d52c8e3b04a9449cb4bc08f5669..cfe9e42de4df891fa768374fd24e38ecbe76c2c7 100644 (file)
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -899,11 +899,19 @@ public final class EmacsService extends Service
     if (DEBUG_IC)
       Log.d (TAG, "resetIC: " + window + ", " + icMode);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-       && (oldMode = window.view.getICMode ()) == icMode
-       /* Don't do this if there is currently no input
-          connection.  */
-       && oldMode != IC_MODE_NULL)
+    oldMode = window.view.getICMode ();
+
+    /* If it's not necessary to reset the input connection for ICMODE to
+       take effect, return immediately.  */
+    if (oldMode == IC_MODE_NULL && icMode == IC_MODE_NULL)
+      {
+       if (DEBUG_IC)
+         Log.d (TAG, "resetIC: redundant invocation ignored");
+       return;
+      }
+
+    if (oldMode == icMode
+       && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
       {
        if (DEBUG_IC)
          Log.d (TAG, "resetIC: calling invalidateInput");

diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 244a3a021662a5221248ff9850d3b4634c458fb7..4a505b3c0dc643db8e7852c388e565d3206fc2a7 100644 (file)
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -891,13 +891,13 @@ public final class EmacsView extends ViewGroup
     return true;
   }
 
-  public synchronized void
+  public void
   setICMode (int icMode)
   {
     this.icMode = icMode;
   }
 
-  public synchronized int
+  public int
   getICMode ()
   {
     return icMode;