commit d8847461c71418aab5286887cc9bb16cb002eee8
author Nancy Chen <nancychen@google.com> Fri Nov 20 20:16:06 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 20 20:16:06 2015 +0000
tree d18109669ad67f36d8c8d6c52625957e24bcb367
parent 6a2d9c8a7d82eb5c2e49d4b31c305308e20abf4b
parent 4ab77feb5825d3d04110d0bd02b7a2692f43ce78

Merge "Add a dialer compat utils class for all things dialer compatibilty." into ub-contactsdialer-b-dev
am: 4ab77feb58

* commit '4ab77feb5825d3d04110d0bd02b7a2692f43ce78':
  Add a dialer compat utils class for all things dialer compatibilty.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16be872..672b529 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" />