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

Commit ea9617d5 authored by Taran Singh's avatar Taran Singh Committed by Android (Google) Code Review
Browse files

Merge "Fix crash when ime target becomes null"

parents cabf95fb 0166b870

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);

    }