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

Commit 83207b52 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Handle some ImeTracker client timeouts" into main

parents 2ba6d2ac 768c2113

core/java/android/view/InsetsController.java

+2 −2
Original line number Diff line number Diff line
@@ -1788,11 +1788,11 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
                    ImeTracker.PHASE_CLIENT_ANIMATION_FINISHED_SHOW);

            ImeTracker.forLogging().onShown(statsToken);

        } else {

            ImeTracker.forLogging().onProgress(statsToken,

                    ImeTracker.PHASE_CLIENT_ANIMATION_FINISHED_HIDE);

            // The requestedVisibleTypes are only send at the end of the hide animation.

            // Therefore, the requested is not finished at this point.

            if (!Flags.refactorInsetsController()) {

                ImeTracker.forLogging().onProgress(statsToken,

                        ImeTracker.PHASE_CLIENT_ANIMATION_FINISHED_HIDE);

                ImeTracker.forLogging().onHidden(statsToken);

            }

        }

core/java/android/view/ViewRootImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -10270,6 +10270,8 @@ public final class ViewRootImpl implements ViewParent, 
        try {

            mWindowSession.notifyImeWindowVisibilityChangedFromClient(mWindow, visible, statsToken);

        } catch (RemoteException e) {

            ImeTracker.forLogging().onFailed(statsToken,

                    ImeTracker.PHASE_CLIENT_NOTIFY_IME_VISIBILITY_CHANGED);

            e.rethrowFromSystemServer();

        }

    }