commit 11dea4d710138c27b2430f171aee48bb2b9e7381
author Adam Cohen <adamcohen@google.com> Mon Oct 15 14:41:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 15 14:41:26 2012 -0700
tree c15cb7a56c1cefb30e8f16541a3f8a2139e781ef
parent f2e28abb1375c5ca513eac9dcde5c349f771de0f
parent ac8a59d3d3a6ddb32a293e4dfc74fb55a0ea6e82

Merge "Fix issue where pin field doesn't have focus (issue 7348937)" into jb-mr1-dev

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java
index 3b37d56..1868507 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java
@@ -86,6 +86,13 @@
         mLockPatternUtils = utils;
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasWindowFocus) {
+        if (hasWindowFocus) {
+            reset();
+        }
+    }
+
     public void reset() {
         // start fresh
         mPasswordEntry.setText("");
@@ -191,7 +198,9 @@
             }
 
             public void afterTextChanged(Editable s) {
-                mCallback.userActivity(0);
+                if (mCallback != null) {
+                    mCallback.userActivity(0);
+                }
             }
         });