From f14fe14a3bd09ac60d70e33248eae88c4da08a66 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Thu, 22 Jun 2017 22:30:45 -0700 Subject: [PATCH] Remove a redundant synchronized block This CL removes a redundant synchronized block, which was accidentally added in the previous CL [1] that simplified TextServicesManagerService (TSMS) by using RemoteCallbackList. Since SpellCheckerBindGroup#removeListener() internally acquires the lock on TSMS#mSpellCheckerMap, there is no need to acquire the same lock in the caller. This CL is just a mechanical clean-up. No behavior change is intended. [1]: I38942765ed6bec6713757b1d5f325e7a633c2ba7 f982e75a262db16e60fd3565638d399315dba761 Bug: 35102403 Test: compile Change-Id: I6d47e8cb6e301286bcb26922b74ee7cac2c5c1c5 --- .../com/android/server/TextServicesManagerService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java index 21aeee292ed52..098b43c897e74 100644 --- a/services/core/java/com/android/server/TextServicesManagerService.java +++ b/services/core/java/com/android/server/TextServicesManagerService.java @@ -1024,7 +1024,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { } } - private final class InternalDeathRecipients extends + private static final class InternalDeathRecipients extends RemoteCallbackList { private final SpellCheckerBindGroup mGroup; @@ -1034,11 +1034,8 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { @Override public void onCallbackDied(ISpellCheckerSessionListener listener) { - synchronized(mSpellCheckerMap) { - mGroup.removeListener(listener); - } + mGroup.removeListener(listener); } - } private static final class ISpellCheckerServiceCallbackBinder