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

Commit 0819175a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Minor IME related protolog changes" into main

parents ca0e7143 4785e124

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

+4 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
                // If the server visibility didn't change (still visible), and mGivenInsetsReady

                // is set, we won't call into notifyControlChanged. Therefore, we can reset the

                // statsToken, if available.

                ProtoLog.d(WM_DEBUG_IME, "onPostLayout cancel statsToken, ws=%s", ws);

                ProtoLog.w(WM_DEBUG_IME, "onPostLayout cancel statsToken, ws=%s", ws);

                ImeTracker.forLogging().onCancelled(mStatsToken,

                        ImeTracker.PHASE_WM_POST_LAYOUT_NOTIFY_CONTROLS_CHANGED);

                mStatsToken = null;
@@ -293,8 +293,9 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
                } else {

                    ProtoLog.w(WM_DEBUG_IME,

                            "Tried to update client visibility for non-IME input target %s "

                                    + "(current target: %s)",

                            caller, mDisplayContent.getImeInputTarget());

                                    + "(current target: %s, IME requested: %s)", caller,

                            mDisplayContent.getImeInputTarget(),

                            caller.isRequestedVisible(WindowInsets.Type.ime()));

                    ImeTracker.forLogging().onFailed(statsToken,

                            ImeTracker.PHASE_SERVER_UPDATE_CLIENT_VISIBILITY);

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ class InsetsStateController { 
        InsetsControlTarget target = imeTarget != null ? imeTarget : mEmptyImeControlTarget;

        onControlTargetChanged(getImeSourceProvider(), target, false /* fake */);

        ProtoLog.d(WM_DEBUG_IME, "onImeControlTargetChanged %s",

                target != null ? target.getWindow() : "null");

                target != null && target.getWindow() != null ? target.getWindow() : target);

        notifyPendingInsetsControlChanged();

    }