Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check around mImeRequester.getWindow()" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-22 20:18:37 +00:00
committed by Android (Google) Code Review
parent 6769aa516c 2b71400356
commit 7c2b1d57db
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java
View File

@@ -257,8 +257,10 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider {
void dumpDebug(ProtoOutputStream proto, long fieldId, @WindowTraceLogLevel int logLevel) { void dumpDebug(ProtoOutputStream proto, long fieldId, @WindowTraceLogLevel int logLevel) {
final long token = proto.start(fieldId); final long token = proto.start(fieldId);
super.dumpDebug(proto, INSETS_SOURCE_PROVIDER, logLevel); super.dumpDebug(proto, INSETS_SOURCE_PROVIDER, logLevel);
if (mImeRequester != null) { final WindowState imeRequesterWindow =
mImeRequester.getWindow().dumpDebug(proto, IME_TARGET_FROM_IME, logLevel); mImeRequester != null ? mImeRequester.getWindow() : null;
if (imeRequesterWindow != null) {
imeRequesterWindow.dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);
} }
proto.write(IS_IME_LAYOUT_DRAWN, mIsImeLayoutDrawn); proto.write(IS_IME_LAYOUT_DRAWN, mIsImeLayoutDrawn);
proto.end(token); proto.end(token);