summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/CryptKeeper.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index d974d005d..de7b05af3 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -599,11 +599,13 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
}
// Asynchronously throw up the IME, since there are issues with requesting it to be shown
// immediately.
- mHandler.postDelayed(new Runnable() {
- @Override public void run() {
- imm.showSoftInputUnchecked(0, null);
- }
- }, 0);
+ if (mLockPatternView == null) {
+ mHandler.postDelayed(new Runnable() {
+ @Override public void run() {
+ imm.showSoftInputUnchecked(0, null);
+ }
+ }, 0);
+ }
updateEmergencyCallButtonState();
// Notify the user in 120 seconds that we are waiting for him to enter the password.