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

Commit afc8080c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034153



Change-Id: Ia55770dca6c1661016e885c01caddaab832bd647
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66439a2a d39f0f7c

packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class KeyguardPasswordViewController 
    private final boolean mShowImeAtScreenOn;

    private EditText mPasswordEntry;

    private ImageView mSwitchImeButton;

    private boolean mPaused;



    private final OnEditorActionListener mOnEditorActionListener = (v, actionId, event) -> {

        // Check if this was the result of hitting the enter key
@@ -202,6 +203,7 @@ public class KeyguardPasswordViewController 
    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        mPaused = false;

        if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {

            showInput();

        }
@@ -222,6 +224,11 @@ public class KeyguardPasswordViewController 


    @Override

    public void onPause() {

        if (mPaused) {

            return;

        }

        mPaused = true;



        if (!mPasswordEntry.isVisibleToUser()) {

            // Reset all states directly and then hide IME when the screen turned off.

            super.onPause();