commit ef3b391a10f2920b422c89f3170b95a2984268a6
author Jeff Sharkey <jsharkey@google.com> Thu Nov 19 18:45:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 19 18:45:42 2015 +0000
tree 01e6a636cf4d4d26e81a6cd2092ce61d82e3ba4e
parent 498316c6d715da082f520d03d68d66c00d510c2c
parent 8d658035f19cab2782e95b8cfa469ebcd8716a4c

Merge "Mark this coreApp as being encryptionAware."

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 8882cde..ea4d29b 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -38,7 +38,9 @@
     <application android:label="@string/english_ime_name"
             android:icon="@drawable/ic_launcher_keyboard"
             android:supportsRtl="true"
-            android:allowBackup="true">
+            android:allowBackup="true"
+            android:forceDeviceEncrypted="true"
+            android:encryptionAware="true">
 
         <!-- Services -->
         <service android:name="LatinIME"