Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 341ebdd8 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Automerger Merge Worker
Browse files

Simplify RemoteInputConnectionImpl#finishComposingText*() am: a9156d61 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2911242



Change-Id: Ib8e9d609f5bb53165d765ccafd4713aa37a8fd79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efedb4a8 a9156d61

core/java/android/view/inputmethod/RemoteInputConnectionImpl.java

+2 −10
Original line number Diff line number Diff line
@@ -830,11 +830,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { 
                return;  // cancelled

            }

            InputConnection ic = getInputConnection();

            // Note we do NOT check isActive() here, because this is safe

            // for an IME to call at any time, and we need to allow it

            // through to clean up our state after the IME has switched to

            // another client.

            if (ic == null) {

            if (ic == null || !isActive()) {

                Log.w(TAG, "finishComposingTextFromImm on inactive InputConnection");

                return;

            }
@@ -858,11 +854,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { 
                return;  // cancelled

            }

            InputConnection ic = getInputConnection();

            // Note we do NOT check isActive() here, because this is safe

            // for an IME to call at any time, and we need to allow it

            // through to clean up our state after the IME has switched to

            // another client.

            if (ic == null) {

            if (ic == null && !isActive()) {

                Log.w(TAG, "finishComposingText on inactive InputConnection");

                return;

            }