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

Commit 9ede269a authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Automerger Merge Worker
Browse files

Merge "Fix race condition in dumpDebug" into udc-qpr-dev am: 980ec261 

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



Change-Id: I28de3a956c984ef4a127d4cd11c83deb18160db5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1a0bbc9 980ec261

core/java/android/view/inputmethod/InputMethodManager.java

+6 −7
Original line number Diff line number Diff line
@@ -4361,15 +4361,14 @@ public final class InputMethodManager { 
     * @param icProto {@link InputConnection} call data in proto format.

     * @hide

     */

    @GuardedBy("mH")

    public void dumpDebug(ProtoOutputStream proto, @Nullable byte[] icProto) {

        synchronized (mH) {

            if (!isImeSessionAvailableLocked()) {

                return;

            }



            proto.write(DISPLAY_ID, mDisplayId);

            final long token = proto.start(INPUT_METHOD_MANAGER);

        synchronized (mH) {

            proto.write(CUR_ID, mCurBindState.mImeId);

            proto.write(FULLSCREEN_MODE, mFullscreenMode);

            proto.write(ACTIVE, mActive);