commit a0a76f95b2f0b7d38d45f7e891e4261128b50783
author Jeff Sharkey <jsharkey@android.com> Thu Mar 17 11:00:41 2016 -0600
committer Jeff Sharkey <jsharkey@android.com> Thu Mar 17 11:35:34 2016 -0600
tree d3202b655e42be5c7e9390945f58e8071eeb7dd0
parent 2678c621aef740e662114cf608388d0e4be4f2d7

Follow framework refactoring.

Bug: 27531029
Change-Id: Ia938f4b2da76443c6f4467fd427b6cd7e9e60851

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4262877..7ace0e0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -70,8 +70,8 @@
             android:supportsRtl="true"
             android:process="system"
             android:usesCleartextTraffic="false"
-            android:forceDeviceEncrypted="true"
-            android:encryptionAware="true">
+            android:defaultToDeviceProtectedStorage="true"
+            android:directBootAware="true">
 
         <!-- CALL vs CALL_PRIVILEGED vs CALL_EMERGENCY
              We have three different intents through which a call can be initiated each with its