commit aead1b2581c2594c18e16b56325b615c5944f6d7
author Paul Lawrence <paullawrence@google.com> Fri Sep 18 15:32:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 15:32:29 2015 +0000
tree 61fa50818b10875350ac338b7c13d35243403230
parent 8d28491a2f2d8ef8e2142171d290f46f381c8a76
parent 43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d

am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev

* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
  Stop long passwords crashing CryptKeeper

res/layout/crypt_keeper_password_field.xml

diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 34c7f64..8102658 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -28,6 +28,7 @@
         android:inputType="textPassword"
         android:textSize="16sp"
         android:padding="10sp"
+        android:maxLength="500"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
    <include layout="@layout/crypt_keeper_switch_input_method" />

res/layout/crypt_keeper_pin_field.xml

diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 56b4978..a13142e 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -28,6 +28,7 @@
         android:inputType="numberPassword"
         android:textSize="28sp"
         android:padding="4sp"
+        android:maxLength="500"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
    <include layout="@layout/crypt_keeper_switch_input_method" />