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

Commit 1a3c5d96 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Automerger Merge Worker
Browse files

Merge "PHASE_IME_APPLY_VISIBILITY_INSETS_CONSUMER timeout" into udc-qpr-dev am: 80fafb7d 

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



Change-Id: Ie4be8093f6f51a6de096dd59c3758730a6986b5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49e37d2e 80fafb7d

core/java/android/inputmethodservice/InputMethodService.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -2986,8 +2986,6 @@ public class InputMethodService extends AbstractInputMethodService { 
        ImeTracing.getInstance().triggerServiceDump(

        ImeTracing.getInstance().triggerServiceDump(

                "InputMethodService#applyVisibilityInInsetsConsumerIfNecessary", mDumper,

                "InputMethodService#applyVisibilityInInsetsConsumerIfNecessary", mDumper,

                null /* icProto */);

                null /* icProto */);

        ImeTracker.forLogging().onProgress(mCurStatsToken,

                ImeTracker.PHASE_IME_APPLY_VISIBILITY_INSETS_CONSUMER);

        mPrivOps.applyImeVisibilityAsync(setVisible

        mPrivOps.applyImeVisibilityAsync(setVisible

                ? mCurShowInputToken : mCurHideInputToken, setVisible, mCurStatsToken);

                ? mCurShowInputToken : mCurHideInputToken, setVisible, mCurStatsToken);

    }

    }

core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -386,8 +386,12 @@ public final class InputMethodPrivilegedOperations { 
            @Nullable ImeTracker.Token statsToken) {

            @Nullable ImeTracker.Token statsToken) {

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        if (ops == null) {

        if (ops == null) {

            ImeTracker.forLogging().onFailed(statsToken,

                    ImeTracker.PHASE_IME_APPLY_VISIBILITY_INSETS_CONSUMER);

            return;

            return;

        }

        }

        ImeTracker.forLogging().onProgress(statsToken,

                ImeTracker.PHASE_IME_APPLY_VISIBILITY_INSETS_CONSUMER);

        try {

        try {

            ops.applyImeVisibilityAsync(showOrHideInputToken, setVisible, statsToken);

            ops.applyImeVisibilityAsync(showOrHideInputToken, setVisible, statsToken);

        } catch (RemoteException e) {

        } catch (RemoteException e) {