Merge "Follow framework refactoring." into nyc-dev

am: 297ce9a * commit '297ce9aaf396ab35f28d6c84ad0b3f040494aaf9': Follow framework refactoring.
2016-03-17 22:14:09 +00:00
parent feed83f7a3 297ce9aaf3
commit 2758b99e9d
1 changed files with 2 additions and 2 deletions
--- 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 -->