Merge "Follow framework refactoring." into nyc-dev

2016-03-17 22:00:21 +00:00
parent d0145cc87a a806b7a61c
commit 297ce9aaf3
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 -->