commit d33c07550f986ef45ad28c97859acd9a3d8ded95
author Gopal Krishna Shukla <gshukla@codeaurora.org> Thu Jun 30 11:34:21 2016 +0530
committer Yohei Yukawa <yukawa@google.com> Thu Sep 15 23:20:05 2016 -0700
tree 48e6ec778e7789438c4d6914d5d0d2a0d04b791e
parent b5cc0b55e36d4849cf7d2a976c000dd5aa2aec00

Remove synchronization from getCurrentInputMethodSubtype()

getCurrentInputMethodSubtype() acquires InputManagerService.mMethodMap
within its body. There seems to be no reason for holding
InputMethodManager.mH to call getCurrentInputMethodSubtype(). Holding mH
can cause potential deadlock b/w two threads acquiring mH and mMethodMap
in different orders.

Bug: 31247871
Bug: 31273203
Bug: b.android.com/218423
Change-Id: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d

core/java/android/view/inputmethod/InputMethodManager.java

diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index c0c8e64..2e9cbf2 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -2056,12 +2056,10 @@
      * have any input method subtype.
      */
     public InputMethodSubtype getCurrentInputMethodSubtype() {
-        synchronized (mH) {
-            try {
-                return mService.getCurrentInputMethodSubtype();
-            } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
-            }
+        try {
+            return mService.getCurrentInputMethodSubtype();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
         }
     }