commit e9f212899e00ac82d8d3db4cfddcd99219bdcb9a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 15 18:38:56 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 15 18:38:56 2020 +0000
tree f460c1f89f6af07f90be1a59f6993afee68d8a28
parent db32530cab16ddf7ac44c982ab9caa46fa233909
parent adf530fc264267260aae06231e4be59c74f30a36

Merge "Fix SoftInputShowHideHistory entry seq number representation" into rvc-dev am: adf530fc26

Change-Id: Id4770bc25942fa2d841cdb31152e624d7e7c1f88

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

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index e6cb371..b949d6b 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -784,6 +784,7 @@
         private static final AtomicInteger sSequenceNumber = new AtomicInteger(0);
 
         private static final class Entry {
+            final int mSequenceNumber = sSequenceNumber.getAndIncrement();
             final ClientState mClientState;
             @SoftInputModeFlags
             final int mFocusedWindowSoftInputMode;
@@ -831,7 +832,7 @@
                     continue;
                 }
                 pw.print(prefix);
-                pw.println("SoftInputShowHideHistory #" + sSequenceNumber.getAndIncrement() + ":");
+                pw.println("SoftInputShowHideHistory #" + entry.mSequenceNumber + ":");
 
                 pw.print(prefix);
                 pw.println(" time=" + dataFormat.format(new Date(entry.mWallTime))