diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-03-17 22:09:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-17 22:09:46 +0000 |
| commit | 78bcc89df493fa4cc96f893272193fd6b99cdaed (patch) | |
| tree | 22cc864d59f126672c151924bbedef3cb67473fc /packages/InputDevices | |
| parent | 929d90cf280002482d3c9d382625d64610885a2e (diff) | |
| parent | 5a128c4f33aa38d3a35b5884519f6bd3a355512d (diff) | |
Merge "Refactoring FBE APIs based on council feedback." into nyc-dev am: a0a58a2
am: 5a128c4
* commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d':
Refactoring FBE APIs based on council feedback.
Diffstat (limited to 'packages/InputDevices')
| -rw-r--r-- | packages/InputDevices/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/InputDevices/AndroidManifest.xml b/packages/InputDevices/AndroidManifest.xml index 07885ea6f04b..9507c9f5a199 100644 --- a/packages/InputDevices/AndroidManifest.xml +++ b/packages/InputDevices/AndroidManifest.xml @@ -7,8 +7,8 @@ android:allowClearUserData="false" android:label="@string/app_label" android:process="system" - android:forceDeviceEncrypted="true" - android:encryptionAware="true"> + android:defaultToDeviceProtectedStorage="true" + android:directBootAware="true"> <receiver android:name=".InputDeviceReceiver" android:label="@string/keyboard_layouts_label"> |