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

Commit 948850fc authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Remove mis-specified @GuardedBy("mMethodMap")" into sc-dev

parents 3453a46d 597dbb07

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

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

     */

    @BinderThread

    @BinderThread

    @Override

    @Override

    @GuardedBy("mMethodMap")

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

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

            IVoidResultCallback resultCallback) {

            IVoidResultCallback resultCallback) {

        CallbackUtils.onResult(resultCallback, () -> {

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

        });

    }

    }





    @GuardedBy("mMethodMap")

    private void dumpDebug(ProtoOutputStream proto, long fieldId) {

    private void dumpDebug(ProtoOutputStream proto, long fieldId) {

        synchronized (mMethodMap) {

        synchronized (mMethodMap) {

            final long token = proto.start(fieldId);

            final long token = proto.start(fieldId);