commit cec1191f95007173a4170d63dfa15e1a349a6cab
author Jeff Sharkey <jsharkey@android.com> Thu Mar 17 22:18:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 17 22:18:30 2016 +0000
tree 6061ccfbeae482da198f58a39596d9dcc732c185
parent 87e19905462e1f174d4d73fdfdf3e16da4c2305f
parent 1775b73f2b24298860b37849131f1977b52eb7c7

Follow framework refactoring. am: a9298f8
am: 1775b73

* commit '1775b73f2b24298860b37849131f1977b52eb7c7':
  Follow framework refactoring.

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index ea4d29b..9bb16c7 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -39,8 +39,8 @@
             android:icon="@drawable/ic_launcher_keyboard"
             android:supportsRtl="true"
             android:allowBackup="true"
-            android:forceDeviceEncrypted="true"
-            android:encryptionAware="true">
+            android:defaultToDeviceProtectedStorage="true"
+            android:directBootAware="true">
 
         <!-- Services -->
         <service android:name="LatinIME"