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

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

Merge "Fix regression where promptReason would dissapear"

parents ea6c89b7 c6b50c66

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

+1 −1
Original line number Diff line number Diff line
@@ -373,11 +373,11 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
            mPendingLockCheck.cancel(false);

            mPendingLockCheck = null;

        }

        displayDefaultSecurityMessage();

    }



    @Override

    public void onResume(int reason) {

        displayDefaultSecurityMessage();

    }



    @Override

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ class KeyguardPatternViewTest : SysuiTestCase() { 
    }



    @Test

    fun onResume_clearsTextField() {

    fun onPause_clearsTextField() {

        mSecurityMessage.setMessage("an old message")

        mKeyguardPatternView.onResume(KeyguardSecurityView.SCREEN_ON)

        mKeyguardPatternView.onPause()

        assertThat(mSecurityMessage.text).isEqualTo("")

    }

}