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

Merge "Prevent re-entrant calls to onPause" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-23 14:54:51 +00:00
committed by Android (Google) Code Review
parent e8a0838648 6c1d067e9a
commit d39f0f7cfd
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java
View File

@@ -59,6 +59,7 @@ public class KeyguardPasswordViewController
private final boolean mShowImeAtScreenOn; private final boolean mShowImeAtScreenOn;
private EditText mPasswordEntry; private EditText mPasswordEntry;
private ImageView mSwitchImeButton; private ImageView mSwitchImeButton;
private boolean mPaused;
private final OnEditorActionListener mOnEditorActionListener = (v, actionId, event) -> { private final OnEditorActionListener mOnEditorActionListener = (v, actionId, event) -> {
// Check if this was the result of hitting the enter key // Check if this was the result of hitting the enter key
@@ -202,6 +203,7 @@ public class KeyguardPasswordViewController
@Override @Override
public void onResume(int reason) { public void onResume(int reason) {
super.onResume(reason); super.onResume(reason);
mPaused = false;
if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) { if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {
showInput(); showInput();
} }
@@ -222,6 +224,11 @@ public class KeyguardPasswordViewController
@Override @Override
public void onPause() { public void onPause() {
if (mPaused) {
return;
}
mPaused = true;
if (!mPasswordEntry.isVisibleToUser()) { if (!mPasswordEntry.isVisibleToUser()) {
// Reset all states directly and then hide IME when the screen turned off. // Reset all states directly and then hide IME when the screen turned off.
super.onPause(); super.onPause();