commit 1775b73f2b24298860b37849131f1977b52eb7c7
author Jeff Sharkey <jsharkey@android.com> Thu Mar 17 22:14:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 17 22:14:24 2016 +0000
tree fe1c641302b259a112c22208d109dfce107afc7d
parent b31cd18ea6aed977f731b7abfcd977631849465c
parent a9298f88442aae49a0817513209230e3e6e8d4e0

Follow framework refactoring.
am: a9298f8

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