commit 92b2fe5d0d9781d57f3a2520eecc83682e9aa8ed
author Adrian Roos <roosa@google.com> Mon Feb 09 16:41:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 09 16:41:32 2015 +0000
tree a93814f77303f4553c886df5acc8f66f58b41fcc
parent 5acdb7c5372b578fcb2c752dc362bad37e32e703
parent fc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba

am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
automerge: fc7e8f0

* commit 'fc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba':
  Only request IME if password view is showing

packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
index dfea166..845d53a 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
@@ -90,9 +90,11 @@
         post(new Runnable() {
             @Override
             public void run() {
-                mPasswordEntry.requestFocus();
-                if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {
-                    mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
+                if (isShown()) {
+                    mPasswordEntry.requestFocus();
+                    if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {
+                        mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
+                    }
                 }
             }
         });