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

Commit 7c2b1d57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 6769aa51 2b714003

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

+4 −2
Original line number Diff line number Diff line
@@ -257,8 +257,10 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
    void dumpDebug(ProtoOutputStream proto, long fieldId, @WindowTraceLogLevel int logLevel) {

        final long token = proto.start(fieldId);

        super.dumpDebug(proto, INSETS_SOURCE_PROVIDER, logLevel);

        if (mImeRequester != null) {

            mImeRequester.getWindow().dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);

        final WindowState imeRequesterWindow =

                mImeRequester != null ? mImeRequester.getWindow() : null;

        if (imeRequesterWindow != null) {

            imeRequesterWindow.dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);

        }

        proto.write(IS_IME_LAYOUT_DRAWN, mIsImeLayoutDrawn);

        proto.end(token);