summaryrefslogtreecommitdiff
path: root/packages/services
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-11-08 16:46:05 -0800
committerJeff Sharkey <jsharkey@android.com>2015-11-11 10:47:23 -0800
commitf9fc6d6cc05595241bc7ced6d4cab97b45f9b901 (patch)
tree0acf0e517de54713340c1ae88085ef9c7f88926e /packages/services
parentcef9219fdad0585ab3948d349f346608a7b9feb3 (diff)
More file-based encryption work.
Add granular StorageManager APIs for key creation/destruction and unlocking/locking. Start passing through an opaque token as part of the unlock command, but leave it empty for now. We now have a separate "prepare" method that sanity checks that user directories are correctly setup. Define a handful of system properties used for marking devices that should be operating in FBE mode, and if they're emulating FBE. Wire a command to "sm", but persisting will come later. Start using new "encryptionAware" flag on apps previously marked with coreApp flag, which were apps running in the legacy CryptKeeper model. Small tweaks to handle non-encryptionAware voice interaction services. Switch PackageManager to consult StorageManager about the unlocked state of a user. Bug: 22358539 Change-Id: Ic2865f9b81c10ea39369c441422f7427a3c3c3d6
Diffstat (limited to 'packages/services')
-rw-r--r--packages/services/Proxy/AndroidManifest.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/services/Proxy/AndroidManifest.xml b/packages/services/Proxy/AndroidManifest.xml
index bbcd6b93bbb0..88f83813fe7f 100644
--- a/packages/services/Proxy/AndroidManifest.xml
+++ b/packages/services/Proxy/AndroidManifest.xml
@@ -7,7 +7,9 @@
<application
android:label="@string/app_label"
- android:process="com.android.proxyhandler">
+ android:process="com.android.proxyhandler"
+ android:forceDeviceEncrypted="true"
+ android:encryptionAware="true">
<service android:name=".ProxyService"
android:exported="true">