diff options
| author | 2025-01-20 04:16:17 -0800 | |
|---|---|---|
| committer | 2025-01-20 04:16:17 -0800 | |
| commit | 0819175a43b7244a4061f917bafd770a4b6cfd3b (patch) | |
| tree | fdd18c02b3de1424fe3a63926164965ae0d097ff | |
| parent | ca0e71437ec5e8b6f8ac3aba0c8ad2541dbd1c39 (diff) | |
| parent | 4785e124494ea3615ef8b549c82aabba9ce1f769 (diff) | |
Merge "Minor IME related protolog changes" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/InsetsStateController.java | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java index 54ae80cfe98a..bcfaa3947e74 100644 --- a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java @@ -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); } diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java index 9df65f60e8d7..9202cf2d5792 100644 --- a/services/core/java/com/android/server/wm/InsetsStateController.java +++ b/services/core/java/com/android/server/wm/InsetsStateController.java @@ -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(); } |