diff options
| -rw-r--r-- | services/core/java/com/android/server/inputmethod/InputMethodManagerService.java | 80 |
1 files changed, 27 insertions, 53 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index b8a63cd7941c..63f8bccc2b9f 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -2882,16 +2882,12 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @GuardedBy("ImfLock.class") void clearClientSessionsLocked() { if (getCurMethodLocked() != null) { - // TODO(b/322816970): Replace this with lambda. - mClientController.forAllClients(new Consumer<ClientState>() { - - @GuardedBy("ImfLock.class") - @Override - public void accept(ClientState c) { - clearClientSessionLocked(c); - clearClientSessionForAccessibilityLocked(c); - } - }); + // TODO(b/324907325): Remove the suppress warnings once b/324907325 is fixed. + @SuppressWarnings("GuardedBy") Consumer<ClientState> clearClientSession = c -> { + clearClientSessionLocked(c); + clearClientSessionForAccessibilityLocked(c); + }; + mClientController.forAllClients(clearClientSession); finishSessionLocked(mEnabledSession); for (int i = 0; i < mEnabledAccessibilitySessions.size(); i++) { @@ -4567,15 +4563,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub super.startImeTrace_enforcePermission(); ImeTracing.getInstance().startTrace(null /* printwriter */); synchronized (ImfLock.class) { - // TODO(b/322816970): Replace this with lambda. - mClientController.forAllClients(new Consumer<ClientState>() { - - @GuardedBy("ImfLock.class") - @Override - public void accept(ClientState c) { - c.mClient.setImeTraceEnabled(true /* enabled */); - } - }); + mClientController.forAllClients(c -> c.mClient.setImeTraceEnabled(true /* enabled */)); } } @@ -4587,15 +4575,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub ImeTracing.getInstance().stopTrace(null /* printwriter */); synchronized (ImfLock.class) { - // TODO(b/322816970): Replace this with lambda. - mClientController.forAllClients(new Consumer<ClientState>() { - - @GuardedBy("ImfLock.class") - @Override - public void accept(ClientState c) { - c.mClient.setImeTraceEnabled(false /* enabled */); - } - }); + mClientController.forAllClients(c -> c.mClient.setImeTraceEnabled(false /* enabled */)); } } @@ -5829,15 +5809,12 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub // We only have sessions when we bound to an input method. Remove this session // from all clients. if (getCurMethodLocked() != null) { - // TODO(b/322816970): Replace this with lambda. - mClientController.forAllClients(new Consumer<ClientState>() { + // TODO(b/324907325): Remove the suppress warnings once b/324907325 is fixed. + @SuppressWarnings("GuardedBy") Consumer<ClientState> clearClientSession = + c -> clearClientSessionForAccessibilityLocked(c, + accessibilityConnectionId); + mClientController.forAllClients(clearClientSession); - @GuardedBy("ImfLock.class") - @Override - public void accept(ClientState c) { - clearClientSessionForAccessibilityLocked(c, accessibilityConnectionId); - } - }); AccessibilitySessionState session = mEnabledAccessibilitySessions.get( accessibilityConnectionId); if (session != null) { @@ -6023,24 +6000,21 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } // Dump ClientController#mClients p.println(" ClientStates:"); - // TODO(b/322816970): Replace this with lambda. - mClientController.forAllClients(new Consumer<ClientState>() { + // TODO(b/324907325): Remove the suppress warnings once b/324907325 is fixed. + @SuppressWarnings("GuardedBy") Consumer<ClientState> clientControllerDump = c -> { + p.println(" " + c + ":"); + p.println(" client=" + c.mClient); + p.println(" fallbackInputConnection=" + + c.mFallbackInputConnection); + p.println(" sessionRequested=" + + c.mSessionRequested); + p.println( + " sessionRequestedForAccessibility=" + + c.mSessionRequestedForAccessibility); + p.println(" curSession=" + c.mCurSession); + }; + mClientController.forAllClients(clientControllerDump); - @GuardedBy("ImfLock.class") - @Override - public void accept(ClientState c) { - p.println(" " + c + ":"); - p.println(" client=" + c.mClient); - p.println(" fallbackInputConnection=" - + c.mFallbackInputConnection); - p.println(" sessionRequested=" - + c.mSessionRequested); - p.println( - " sessionRequestedForAccessibility=" - + c.mSessionRequestedForAccessibility); - p.println(" curSession=" + c.mCurSession); - } - }); p.println(" mCurMethodId=" + getSelectedMethodIdLocked()); client = mCurClient; p.println(" mCurClient=" + client + " mCurSeq=" + getSequenceNumberLocked()); |