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

Commit 70625f93 authored by Felix Stern's avatar Felix Stern
Browse files

Add a new ImeTracker request when dispatching controls, if not statsToken available 

In some cases, the statsToken that is stored in ImeInsetsSourceProvider, is reset before dispatching the leash. In those cases, we still should track the (show) request. Before dispatching the control, this CL creates a new statsToken if there is none stored.

Bug: 393298465
Bug: 383466954
Flag: android.view.inputmethod.refactor_insets_controller
Test: None, logs only
Change-Id: Ib77ff13af2d63f3e149b9da95c8a905a9e44161f
parent 76adf390

core/java/android/view/inputmethod/ImeTracker.java

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ public interface ImeTracker { 
            ORIGIN_CLIENT,

            ORIGIN_SERVER,

            ORIGIN_IME,

            ORIGIN_WM_SHELL,

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface Origin {}

services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java

+11 −5
Original line number Diff line number Diff line
@@ -182,14 +182,20 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
            if (control != null && control.getLeash() != null) {

                ImeTracker.Token statsToken = getAndClearStatsToken();

                if (statsToken == null) {

                    ProtoLog.d(WM_DEBUG_IME, "IME getControl without statsToken");

                } else {

                    ProtoLog.w(WM_DEBUG_IME,

                            "IME getControl without statsToken (check previous request!). "

                                    + "Start new request");

                    // TODO(b/353463205) remove this later after fixing the race of two requests

                    //  that cancel each other (cf. b/383466954#comment19).

                    statsToken = ImeTracker.forLogging().onStart(ImeTracker.TYPE_SHOW,

                            ImeTracker.ORIGIN_SERVER, SoftInputShowHideReason.CONTROLS_CHANGED,

                            false /* fromUser */);

                }

                ImeTracker.forLogging().onProgress(statsToken,

                        ImeTracker.PHASE_WM_GET_CONTROL_WITH_LEASH);

                control.setImeStatsToken(statsToken);

            }

        }

        }

        return control;

    }