commit bbcfda0d35e83b95b2acc742c36ced3f92700ce9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 10 18:25:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 18:25:25 2018 +0000
tree 1f336038fbe6ed361321d0fbf29241d9caa5b6c6
parent ea6c89b7cfe0ded8bdd6a8b1e1e344cb78d736fd
parent c6b50c6601839a4c8b13ae6bc3af2792da629214

Merge "Fix regression where promptReason would dissapear"

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

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
index 2daa33b..112e067 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
@@ -373,11 +373,11 @@
             mPendingLockCheck.cancel(false);
             mPendingLockCheck = null;
         }
+        displayDefaultSecurityMessage();
     }
 
     @Override
     public void onResume(int reason) {
-        displayDefaultSecurityMessage();
     }
 
     @Override

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

diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewTest.kt
index cfe9818..ab3a3e1 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewTest.kt
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewTest.kt
@@ -46,9 +46,9 @@
     }
 
     @Test
-    fun onResume_clearsTextField() {
+    fun onPause_clearsTextField() {
         mSecurityMessage.setMessage("an old message")
-        mKeyguardPatternView.onResume(KeyguardSecurityView.SCREEN_ON)
+        mKeyguardPatternView.onPause()
         assertThat(mSecurityMessage.text).isEqualTo("")
     }
 }