commit e3fc142529b434855b96f17c05abcb07ad5e64cb
author Nancy Chen <nancychen@google.com> Fri Nov 20 01:50:28 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 20 01:50:28 2015 +0000
tree d343a8f7a5d4c1ae48da881ffcc8455ecd216cb5
parent 21421d8127fca46db9bd8f110306a6786fff16f6
parent a1fd281d4989d910ca6b2f78d2321a4792eca36f

Handle backwards compatible permission lookup and requests (1/3).
am: a1fd281d49

* commit 'a1fd281d4989d910ca6b2f78d2321a4792eca36f':
  Handle backwards compatible permission lookup and requests (1/3).

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7565aee..4edddf9 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" />