commit d1cf42af2d4784f7aab9dc26a8191cba0cdc624e
author Amit Mahajan <amitmahajan@google.com> Sat Nov 21 01:00:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 21 01:00:48 2015 +0000
tree 35700413a212a4aee12cfb5c0ddee003e823e2b9
parent 1e422f7c099c949519ed204bf2c0be98160fbbec
parent 9cf11515781910c7fda66a8a27a0fa14ab1ed2af

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 15d31c7..bd6f585 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -135,18 +135,21 @@
     <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
 
     <application android:name="PhoneApp"
-                 android:persistent="true"
-                 android:label="@string/phoneAppLabel"
-                 android:icon="@mipmap/ic_launcher_phone"
-                 android:allowBackup="false"
-                 android:supportsRtl="true"
-                 android:usesCleartextTraffic="true">
-            <provider android:name="IccProvider"
-                      android:authorities="icc"
-                      android:multiprocess="true"
-                      android:exported="true"
-                      android:readPermission="android.permission.READ_CONTACTS"
-                      android:writePermission="android.permission.WRITE_CONTACTS" />
+            android:persistent="true"
+            android:label="@string/phoneAppLabel"
+            android:icon="@mipmap/ic_launcher_phone"
+            android:allowBackup="false"
+            android:supportsRtl="true"
+            android:usesCleartextTraffic="true"
+            android:forceDeviceEncrypted="true"
+            android:encryptionAware="true">
+
+        <provider android:name="IccProvider"
+                android:authorities="icc"
+                android:multiprocess="true"
+                android:exported="true"
+                android:readPermission="android.permission.READ_CONTACTS"
+                android:writePermission="android.permission.WRITE_CONTACTS" />
 
         <!-- Dialer UI that only allows emergency calls -->
         <activity android:name="EmergencyDialer"