summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorGopal Krishna Shukla <gshukla@codeaurora.org>2016-09-16 05:41:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-16 05:41:34 +0000
commit2ef54a4f2b5e957c5767f44e826fe100ec9eec19 (patch)
tree08297acac73a9d1961c8d55453b8cb961f589e6b /core/java/android
parentc3339a263465c513cba8da8f19b9c1b97f52376d (diff)
parente790c7b2feebb7aba7d869aed5a99171a240860c (diff)
Merge "Remove synchronization from getCurrentInputMethodSubtype()" am: 85539bed77 am: d3e1e473df
am: e790c7b2fe Change-Id: I55465d3d95a317c7fdcff99298e89408190e67e3
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index c0c8e64aacc8..2e9cbf20607b 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -2056,12 +2056,10 @@ public final class InputMethodManager {
* 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();
}
}