commit b3d18865ba996caa1f3fb2567c4ddc8983ab94ba
author Antonio Kantek <kanant@google.com> Thu Aug 24 21:18:53 2023 +0000
committer Antonio Kantek <kanant@google.com> Thu Aug 24 21:18:53 2023 +0000
tree 42534253279f7713ae36326bb286eb9943c0d8ed
parent e0f6c22611fede01f445c8b07ee94daf6424e82d

Use try-finally in #hideSoftInputWithToken

Fix: 287045146
Test: atest CtsInputMethodTestCases
Change-Id: I47aa51d469956b911908bae4c1c308441f48dc05

core/java/android/inputmethodservice/InputMethodService.java

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 5066a5e..db49040 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -884,10 +884,13 @@
             mSystemCallingHideSoftInput = true;
             mCurHideInputToken = hideInputToken;
             mCurStatsToken = statsToken;
-            hideSoftInput(flags, resultReceiver);
-            mCurStatsToken = null;
-            mCurHideInputToken = null;
-            mSystemCallingHideSoftInput = false;
+            try {
+                hideSoftInput(flags, resultReceiver);
+            } finally {
+                mCurStatsToken = null;
+                mCurHideInputToken = null;
+                mSystemCallingHideSoftInput = false;
+            }
         }
 
         /**