| commit | 297ce9aaf396ab35f28d6c84ad0b3f040494aaf9 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu Mar 17 22:00:21 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 17 22:00:22 2016 +0000 |
| tree | c189c7db67f3f4a4a19595dcd4061f0d90c8d144 | |
| parent | d0145cc87a0eb2210022793f9d8aaf7f0462fcf9 [diff] | |
| parent | a806b7a61c4c282bc43ead36fc7749c9517acc4a [diff] |
Merge "Follow framework refactoring." into nyc-dev
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 -->