From bf551fe111769196db688971776c2d01979c775a Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Tue, 30 Nov 2021 15:06:06 +0100 Subject: ViewRootImpl: peek IME source instead of creating it Fixes an issue where getting the IME source to check its visibility unintentionally lazily created it. Fixes: 208200189 Test: manual Change-Id: Ib36082b393215fc59e299dea30d3315f3748ca02 --- core/java/android/view/ViewRootImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d053def6abe2..f1eb783726db 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -8411,7 +8411,7 @@ public final class ViewRootImpl implements ViewParent, if (mTranslator != null) { mTranslator.translateInsetsStateInScreenToAppWindow(insetsState); } - if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) { + if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) { ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsChanged", getInsetsController().getHost().getInputMethodManager(), null /* icProto */); } @@ -8436,7 +8436,7 @@ public final class ViewRootImpl implements ViewParent, mTranslator.translateInsetsStateInScreenToAppWindow(insetsState); mTranslator.translateSourceControlsInScreenToAppWindow(activeControls); } - if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) { + if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) { ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsControlChanged", getInsetsController().getHost().getInputMethodManager(), null /* icProto */); } -- cgit v1.2.3-59-g8ed1b