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

Commit 934fe8b2 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Log IME tracing even when RemoteException is thrown from IC 

This is a small preparation to consolidate RemoteException handling
out from InputConnectionWrapper.

With this CL, InputConnectionWrapper no longer early-exits when a
RemoteException is thrown but just falls through to IME tracing logic.
By making this small change, the next CL [1] can split out
RemoteException handling from InputConnectionWrapper as a pure
refactoring.

Anyway neither users nor developers can observe this change unless
they are carefully checking IME tracing result when the IME target app
is being killed.

 [1]: I0ea27e915a07699a4c124750266d84346fbd7bf6

Bug: 192412909
Test: atest CtsInputMethodTestCases:InputConnectionBlockingMethodTest
Change-Id: I5c778a1097e7f05eeff27e7a72966f613076a801
parent 1df67000

core/java/com/android/internal/view/InputConnectionWrapper.java

+18 −12
Original line number Diff line number Diff line
@@ -85,12 +85,13 @@ public class InputConnectionWrapper implements InputConnection { 
        }



        final Completable.CharSequence value = Completable.createCharSequence();

        boolean hadRemoteException = false;

        try {

            mIInputContext.getTextAfterCursor(length, flags, ResultCallbacks.of(value));

        } catch (RemoteException e) {

            return null;

            hadRemoteException = true;

        }

        CharSequence result = Completable.getResultOrNull(

        final CharSequence result = hadRemoteException ? null : Completable.getResultOrNull(

                value, TAG, "getTextAfterCursor()", mCancellationGroup, MAX_WAIT_TIME_MILLIS);



        final AbstractInputMethodService inputMethodService = mInputMethodService.get();
@@ -115,12 +116,13 @@ public class InputConnectionWrapper implements InputConnection { 
        }



        final Completable.CharSequence value = Completable.createCharSequence();

        boolean hadRemoteException = false;

        try {

            mIInputContext.getTextBeforeCursor(length, flags, ResultCallbacks.of(value));

        } catch (RemoteException e) {

            return null;

            hadRemoteException = true;

        }

        CharSequence result = Completable.getResultOrNull(

        final CharSequence result = hadRemoteException ? null : Completable.getResultOrNull(

                value, TAG, "getTextBeforeCursor()", mCancellationGroup, MAX_WAIT_TIME_MILLIS);



        final AbstractInputMethodService inputMethodService = mInputMethodService.get();
@@ -145,12 +147,13 @@ public class InputConnectionWrapper implements InputConnection { 
            return null;

        }

        final Completable.CharSequence value = Completable.createCharSequence();

        boolean hadRemoteException = false;

        try {

            mIInputContext.getSelectedText(flags, ResultCallbacks.of(value));

        } catch (RemoteException e) {

            return null;

            hadRemoteException = true;

        }

        CharSequence result = Completable.getResultOrNull(

        final CharSequence result = hadRemoteException ? null : Completable.getResultOrNull(

                value, TAG, "getSelectedText()", mCancellationGroup, MAX_WAIT_TIME_MILLIS);



        final AbstractInputMethodService inputMethodService = mInputMethodService.get();
@@ -188,13 +191,14 @@ public class InputConnectionWrapper implements InputConnection { 
            return null;

        }

        final Completable.SurroundingText value = Completable.createSurroundingText();

        boolean hadRemoteException = false;

        try {

            mIInputContext.getSurroundingText(beforeLength, afterLength, flags,

                    ResultCallbacks.of(value));

        } catch (RemoteException e) {

            return null;

            hadRemoteException = true;

        }

        SurroundingText result = Completable.getResultOrNull(

        final SurroundingText result = hadRemoteException ? null : Completable.getResultOrNull(

                value, TAG, "getSurroundingText()", mCancellationGroup, MAX_WAIT_TIME_MILLIS);



        final AbstractInputMethodService inputMethodService = mInputMethodService.get();
@@ -215,12 +219,13 @@ public class InputConnectionWrapper implements InputConnection { 
        }



        final Completable.Int value = Completable.createInt();

        boolean hadRemoteException = false;

        try {

            mIInputContext.getCursorCapsMode(reqModes, ResultCallbacks.of(value));

        } catch (RemoteException e) {

            return 0;

            hadRemoteException = true;

        }

        int result = Completable.getResultOrZero(

        final int result = hadRemoteException ? 0 : Completable.getResultOrZero(

                value, TAG, "getCursorCapsMode()", mCancellationGroup, MAX_WAIT_TIME_MILLIS);



        final AbstractInputMethodService inputMethodService = mInputMethodService.get();
@@ -241,12 +246,13 @@ public class InputConnectionWrapper implements InputConnection { 
        }



        final Completable.ExtractedText value = Completable.createExtractedText();

        boolean hadRemoteException = false;

        try {

            mIInputContext.getExtractedText(request, flags, ResultCallbacks.of(value));

        } catch (RemoteException e) {

            return null;

            hadRemoteException = true;

        }

        ExtractedText result = Completable.getResultOrNull(

        final ExtractedText result = hadRemoteException ? null : Completable.getResultOrNull(

                value, TAG, "getExtractedText()", mCancellationGroup, MAX_WAIT_TIME_MILLIS);



        final AbstractInputMethodService inputMethodService = mInputMethodService.get();