summaryrefslogtreecommitdiff
path: root/packages/services
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-03-16 16:25:45 -0600
committerJeff Sharkey <jsharkey@android.com>2016-03-17 14:49:08 -0600
commit8a372a0a280127743ce9a7ce4b6198c7a02d2a4f (patch)
treef2446f9d00e6dc0be78885db357719b9b3830e48 /packages/services
parent58ae278294017abca0dffc95f006ae646c88db89 (diff)
Refactoring FBE APIs based on council feedback.
Mostly consists of removing the word "encryption" from most APIs, since we can't actually make promises about the data being encrypted. Bug: 27531029 Change-Id: Iace9d7c4e64716abf86ed11847c40f3947e1d625
Diffstat (limited to 'packages/services')
-rw-r--r--packages/services/Proxy/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/services/Proxy/AndroidManifest.xml b/packages/services/Proxy/AndroidManifest.xml
index 88f83813fe7f..51531e3e1d02 100644
--- a/packages/services/Proxy/AndroidManifest.xml
+++ b/packages/services/Proxy/AndroidManifest.xml
@@ -8,8 +8,8 @@
<application
android:label="@string/app_label"
android:process="com.android.proxyhandler"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<service android:name=".ProxyService"
android:exported="true">