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

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

Merge "Avoid nested tracing for showImePostLayout" into main

parents 7be79a4d 3310a64d

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

+4 −1
Original line number Diff line number Diff line
@@ -237,7 +237,10 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
     */

    void scheduleShowImePostLayout(@NonNull InsetsControlTarget imeTarget,

            @NonNull ImeTracker.Token statsToken) {

        if (mImeRequester != null) {

        if (mImeRequester == null) {

            // Start tracing only on initial scheduled show IME request, to record end-to-end time.

            Trace.asyncTraceBegin(TRACE_TAG_WINDOW_MANAGER, "WMS.showImePostLayout", 0);

        } else {

            // We already have a scheduled show IME request, cancel the previous statsToken and

            // continue with the new one.

            logIsScheduledAndReadyToShowIme(false /* aborted */);

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

+0 −1
Original line number Diff line number Diff line
@@ -8302,7 +8302,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                ImeTracker.forLogging().onProgress(statsToken,

                        ImeTracker.PHASE_WM_HAS_IME_INSETS_CONTROL_TARGET);



                Trace.asyncTraceBegin(TRACE_TAG_WINDOW_MANAGER, "WMS.showImePostLayout", 0);

                final InsetsControlTarget controlTarget = imeTarget.getImeControlTarget();

                imeTarget = controlTarget.getWindow();

                // If InsetsControlTarget doesn't have a window, it's using remoteControlTarget