commit fe9b6d3e2e08e689a6b770df497e717a1a5e767e
author Paul Lawrence <paullawrence@google.com> Fri Sep 18 15:38:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 15:38:15 2015 +0000
tree 2e84145152eccd8c4ac74a12ee0856e4633e245f
parent 98e9c7472ccb8f45220f73bf1c693f681681c00a
parent aead1b2581c2594c18e16b56325b615c5944f6d7

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

* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
  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" />