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

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

Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback"

parents ab894cd4 5b002e03

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+6 −2
Original line number Diff line number Diff line
@@ -264,8 +264,12 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
                super.onEnd(animation);

                if (animation.getTypeMask() == WindowInsets.Type.ime()) {

                    mEntry.mRemoteEditImeAnimatingAway = false;

                    mEntry.mRemoteEditImeVisible =

                            mEditText.getRootWindowInsets().isVisible(WindowInsets.Type.ime());

                    WindowInsets editTextRootWindowInsets = mEditText.getRootWindowInsets();

                    if (editTextRootWindowInsets == null) {

                        Log.w(TAG, "onEnd called on detached view", new Exception());

                    }

                    mEntry.mRemoteEditImeVisible = editTextRootWindowInsets != null

                            && editTextRootWindowInsets.isVisible(WindowInsets.Type.ime());

                    if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) {

                        mController.removeRemoteInput(mEntry, mToken);

                    }