summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2021-08-05 14:41:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-05 14:41:07 +0000
commit02ce38c2cf916cf4c024a8eda9d66f752590bc15 (patch)
tree8488155114b2d5d3e4329115e6885983931e9fc1 /core/java/android
parentc843593f0d53fabbdad7c4f72e94d307d3550c39 (diff)
parentd1ff9740c14fe144a2c67e953d0e4f9a7f8c6e46 (diff)
Merge "Lock down RemoteInputConnectionImpl#getInputConnection()"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 5f659a6afba9..ab7e5a92284f 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1381,8 +1381,7 @@ public final class InputMethodManager {
public boolean isAcceptingText() {
checkFocus();
synchronized (mH) {
- return mServedInputConnection != null
- && mServedInputConnection.getInputConnection() != null;
+ return mServedInputConnection != null && !mServedInputConnection.isFinished();
}
}