commit c65a69316867fbdca06eb1085dec6765d3225c85
author Nancy Chen <nancychen@google.com> Thu Nov 26 01:12:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 26 01:12:32 2015 +0000
tree 65a1a51678aaebbb1f11b961e60676a6f64da3d1
parent 8b4d8aa8b7c069bc7210fc4978ce88b124fe5ac8
parent 1b5158652ecf29602ce62b4c766fc971619d2726

Merge "Guard against crashes in <M devices for getDefaultDialerPackage call." into ub-contactsdialer-b-dev
am: 1b5158652e

* commit '1b5158652ecf29602ce62b4c766fc971619d2726':
  Guard against crashes in <M devices for getDefaultDialerPackage call.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8254f36..e2a3871 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,7 +67,9 @@
         android:hardwareAccelerated="true"
         android:supportsRtl="true"
         android:backupAgent='com.android.dialer.DialerBackupAgent'
-        android:usesCleartextTraffic="false">
+        android:usesCleartextTraffic="false"
+        android:forceDeviceEncrypted="true"
+        android:encryptionAware="true">
 
         <meta-data android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" />