commit 46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a
author Jim Miller <jaggies@google.com> Mon Oct 13 18:15:17 2014 -0700
committer Jim Miller <jaggies@google.com> Tue Oct 14 18:40:30 2014 -0700
tree 2bea20cdff429e942f679ea0616942b569b7a7b8
parent 94dce7618584b4ca51bf17937cbd6cb0c22aaaea

Add a checkbox option to 'require password to decrypt'

Fixes bug 17881324

Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2d80b9..f0b3271 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1164,6 +1164,8 @@
         <activity android:name="ChooseLockPassword" android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name=".EncryptionInterstitial"/>
+
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.Status"
                 android:label="@string/device_status_activity_title"