commit 8d4f01509dc6b2b318baecb29097ba86e020579b
author Amit Mahajan <amitmahajan@google.com> Sat Nov 21 01:00:49 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 21 01:00:49 2015 +0000
tree 0eb124ecd0c932baa5588f28d10f1356acc35657
parent bbebba34974df8179da14999273bf47bbf8b691f
parent 755d6fb62aaf42b1e9c06a3ff04dfc78943a16a8

Merge "Phone refactor (merging Gsm and Cdma phones)"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 30b9e4d..5b0f624 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -76,7 +76,9 @@
             android:allowBackup="false"
             android:supportsRtl="true"
             android:process="system"
-            android:usesCleartextTraffic="false">
+            android:usesCleartextTraffic="false"
+            android:forceDeviceEncrypted="true"
+            android:encryptionAware="true">
 
         <!-- CALL vs CALL_PRIVILEGED vs CALL_EMERGENCY
              We have three different intents through which a call can be initiated each with its