commit a806b7a61c4c282bc43ead36fc7749c9517acc4a
author Jeff Sharkey <jsharkey@android.com> Thu Mar 17 11:04:55 2016 -0600
committer Jeff Sharkey <jsharkey@android.com> Thu Mar 17 11:34:05 2016 -0600
tree 8670fa49aeaec8f09d8e5b7810048347853e4fe2
parent e580f940795da75b920753c75fd4ec43a8db8957

Follow framework refactoring.

Bug: 27531029
Change-Id: Iad76ba8ae7aab361f4f3147d9ac268bc480267e7

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fbe55a7..6d0be05 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -91,8 +91,8 @@
             android:supportsRtl="true"
             android:allowBackup="false"
             android:usesCleartextTraffic="true"
-            android:forceDeviceEncrypted="true"
-            android:encryptionAware="true">
+            android:defaultToDeviceProtectedStorage="true"
+            android:directBootAware="true">
 
         <!-- Settings -->