Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d3c9c1e authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Automerger Merge Worker
Browse files

Merge "Remove mis-specified @GuardedBy("mMethodMap")" into sc-dev am: 948850fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13957139

Change-Id: I08cf3af9a166b648c9635b37d1006b8eb8b2313f
parents b3a671bc 948850fc

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -4101,7 +4101,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
     */

    @BinderThread

    @Override

    @GuardedBy("mMethodMap")

    public void startProtoDump(byte[] protoDump, int source, String where,

            IVoidResultCallback resultCallback) {

        CallbackUtils.onResult(resultCallback, () -> {
@@ -4198,7 +4197,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        });

    }



    @GuardedBy("mMethodMap")

    private void dumpDebug(ProtoOutputStream proto, long fieldId) {

        synchronized (mMethodMap) {

            final long token = proto.start(fieldId);