From 23a6076dbbce404a91ce849472a937fb8a26f6d4 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 17 Mar 2016 11:01:30 -0600
Subject: Follow framework refactoring.

Bug: 27531029
Change-Id: I01119fad6624aa7d97558422474767bb02bc3012
---
 AndroidManifest.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ae64e2fa0..8892c24c1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,8 +68,7 @@
         android:hardwareAccelerated="true"
         android:supportsRtl="true"
         android:backupAgent='com.android.dialer.DialerBackupAgent'
-        android:usesCleartextTraffic="false"
-        android:forceDeviceEncrypted="false">
+        android:usesCleartextTraffic="false">
 
         <meta-data android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" />
@@ -85,8 +84,7 @@
             android:icon="@mipmap/ic_launcher_phone"
             android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
             android:resizeableActivity="true"
-            android:encryptionAware="true"
-            >
+            android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.DIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -281,12 +279,12 @@
 
         <service
             android:name=".calllog.CallLogNotificationsService"
-            android:encryptionAware="true"
+            android:directBootAware="true"
             android:exported="false"
         />
 
         <receiver android:name=".calllog.MissedCallNotificationReceiver"
-            android:encryptionAware="true">
+            android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
             </intent-filter>
@@ -316,13 +314,13 @@
                   android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboardHidden"
                   android:exported="false"
                   android:screenOrientation="nosensor"
-                  android:encryptionAware="true"
+                  android:directBootAware="true"
                   android:resizeableActivity="true">
         </activity>
 
         <service android:name="com.android.incallui.InCallServiceImpl"
                  android:permission="android.permission.BIND_INCALL_SERVICE"
-                 android:encryptionAware="true" >
+                 android:directBootAware="true" >
             <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
             <meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING"
                 android:value="false"/>
@@ -333,7 +331,7 @@
 
         <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
         <receiver android:name="com.android.incallui.NotificationBroadcastReceiver"
-            android:encryptionAware="true"
+            android:directBootAware="true"
             android:exported="false" />
 
         <provider
-- 
cgit v1.2.3