aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-03-17 22:18:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-17 22:18:30 +0000
commitcec1191f95007173a4170d63dfa15e1a349a6cab (patch)
tree6061ccfbeae482da198f58a39596d9dcc732c185 /java
parent87e19905462e1f174d4d73fdfdf3e16da4c2305f (diff)
parent1775b73f2b24298860b37849131f1977b52eb7c7 (diff)
downloadlatinime-cec1191f95007173a4170d63dfa15e1a349a6cab.tar.gz
latinime-cec1191f95007173a4170d63dfa15e1a349a6cab.tar.xz
latinime-cec1191f95007173a4170d63dfa15e1a349a6cab.zip
Follow framework refactoring. am: a9298f8
am: 1775b73 * commit '1775b73f2b24298860b37849131f1977b52eb7c7': Follow framework refactoring.
Diffstat (limited to 'java')
-rw-r--r--java/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index ea4d29be7..9bb16c7ff 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -39,8 +39,8 @@
android:icon="@drawable/ic_launcher_keyboard"
android:supportsRtl="true"
android:allowBackup="true"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<!-- Services -->
<service android:name="LatinIME"