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

Commit 957d06bf authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Fix confusing Log.e message in SpellCheckerSession" into pi-dev am: efcd6e1c 

am: 32355d12

Change-Id: I49383474cc086de13352df36ea3bf8855acf7ff6
parents b15f9f11 32355d12

core/java/android/view/textservice/SpellCheckerSession.java

+7 −1
Original line number Diff line number Diff line
@@ -445,9 +445,15 @@ public class SpellCheckerSession { 
        private void processOrEnqueueTask(SpellCheckerParams scp) {

            ISpellCheckerSession session;

            synchronized (this) {

                if (scp.mWhat == TASK_CLOSE && (mState == STATE_CLOSED_AFTER_CONNECTION

                        || mState == STATE_CLOSED_BEFORE_CONNECTION)) {

                    // It is OK to call SpellCheckerSession#close() multiple times.

                    // Don't output confusing/misleading warning messages.

                    return;

                }

                if (mState != STATE_WAIT_CONNECTION && mState != STATE_CONNECTED) {

                    Log.e(TAG, "ignoring processOrEnqueueTask due to unexpected mState="

                            + taskToString(scp.mWhat)

                            + stateToString(mState)

                            + " scp.mWhat=" + taskToString(scp.mWhat));

                    return;

                }