From 3f7c4a3c0d504ae9dba1013574e48a9df205380b Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 16 Jul 2021 12:09:37 -0700 Subject: [PATCH] Check MissingMethodFlags.COMMIT_CORRECTION at the right place This is a follow up CL to my previous CL [1], which aimed to put an early-exit check for InputConnection#commitCorrection(CorrectionInfo) but mistakenly put it in InputConnection#commitCompletion(CompletionInfo). With this CL the early-exit check will be placed at the right place. [1]: I3c58fadd924fad72cb984f0c23d3099fd0295c64 19a80a1e807acd00bec999eaac7812da6ffce954 Fix: 193907158 Test: atest CtsInputMethodTestCases:InputConnectionEndToEndTest Change-Id: I497628165072c73d0e279f89afe0d8730531ecfc --- .../android/inputmethodservice/RemoteInputConnection.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/inputmethodservice/RemoteInputConnection.java b/core/java/android/inputmethodservice/RemoteInputConnection.java index 4fa98be75b46c..ff6265f8d6999 100644 --- a/core/java/android/inputmethodservice/RemoteInputConnection.java +++ b/core/java/android/inputmethodservice/RemoteInputConnection.java @@ -247,15 +247,15 @@ final class RemoteInputConnection implements InputConnection { @AnyThread public boolean commitCompletion(CompletionInfo text) { - if (isMethodMissing(MissingMethodFlags.COMMIT_CORRECTION)) { - // This method is not implemented. - return false; - } return mInvoker.commitCompletion(text); } @AnyThread public boolean commitCorrection(CorrectionInfo correctionInfo) { + if (isMethodMissing(MissingMethodFlags.COMMIT_CORRECTION)) { + // This method is not implemented. + return false; + } return mInvoker.commitCorrection(correctionInfo); }