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

Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-04 18:05:41 +00:00
committed by Android (Google) Code Review
parent e8ee9cd8d4 f1ecdee533
commit c9a1ec32a3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,8 +269,12 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
super.onEnd(animation); super.onEnd(animation);
if (animation.getTypeMask() == WindowInsets.Type.ime()) { if (animation.getTypeMask() == WindowInsets.Type.ime()) {
mEntry.mRemoteEditImeAnimatingAway = false; mEntry.mRemoteEditImeAnimatingAway = false;
mEntry.mRemoteEditImeVisible = WindowInsets editTextRootWindowInsets = mEditText.getRootWindowInsets();
mEditText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()); 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) { if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) {
mController.removeRemoteInput(mEntry, mToken); mController.removeRemoteInput(mEntry, mToken);
} }