commit 980ec261c65e0cb863d09592f2bcb93bdaebfde2
author Cosmin Băieș <cosminbaies@google.com> Tue May 30 12:11:32 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 30 12:11:32 2023 +0000
tree 4982fc4cc308265fc17a69bbe0d36d9b1c4da62f
parent cc63ab71d7367d67125d4d15436eb8771fd66d6a
parent c17200a23a9c60d185f1c6b60da9acbc49675324

Merge "Fix race condition in dumpDebug" into udc-qpr-dev

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

diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 41ef44e..40b060a 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -4361,15 +4361,14 @@
      * @param icProto {@link InputConnection} call data in proto format.
      * @hide
      */
-    @GuardedBy("mH")
     public void dumpDebug(ProtoOutputStream proto, @Nullable byte[] icProto) {
-        if (!isImeSessionAvailableLocked()) {
-            return;
-        }
-
-        proto.write(DISPLAY_ID, mDisplayId);
-        final long token = proto.start(INPUT_METHOD_MANAGER);
         synchronized (mH) {
+            if (!isImeSessionAvailableLocked()) {
+                return;
+            }
+
+            proto.write(DISPLAY_ID, mDisplayId);
+            final long token = proto.start(INPUT_METHOD_MANAGER);
             proto.write(CUR_ID, mCurBindState.mImeId);
             proto.write(FULLSCREEN_MODE, mFullscreenMode);
             proto.write(ACTIVE, mActive);