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

Commit 0166b870 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix crash when ime target becomes null 

Test: android.server.wm
Bug: 111084606
Change-Id: Ic198af081f4a9338b6310c8ce0f03eff0299ac3b
parent b0dbae34

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

+4 −1
Original line number Diff line number Diff line
@@ -96,8 +96,11 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider { 
        // TODO(b/139861270): Remove the child & sublayer check once IMMS is aware of

        //  actual IME target.

        final WindowState dcTarget = mDisplayContent.mInputMethodTarget;

        if (dcTarget == null) {

            return false;

        }

        return (!dcTarget.isClosing() && mImeTargetFromIme == dcTarget)

                || (dcTarget.getParentWindow() == mImeTargetFromIme

                || (mImeTargetFromIme != null && dcTarget.getParentWindow() == mImeTargetFromIme

                        && dcTarget.mSubLayer > mImeTargetFromIme.mSubLayer);

    }