Merge "Fix regression where promptReason would dissapear"

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

@@ -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

@@ -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("")
     }
 }