diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-03-10 19:59:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-10 19:59:12 +0000 |
| commit | bb293bfd56125febe42ddef5cdcb630abf1b12c9 (patch) | |
| tree | 0df81fab2bd0bcb8c30a1ba1469a925ef9b730b1 /AndroidManifest.xml | |
| parent | 26466e02b466288e1fd11c31b1207d72e543b1e8 (diff) | |
| parent | 3cb83e0eb5db07ce4c3feba9a19b8f9f674d357a (diff) | |
| download | android_packages_apps_Dialer-bb293bfd56125febe42ddef5cdcb630abf1b12c9.tar.gz android_packages_apps_Dialer-bb293bfd56125febe42ddef5cdcb630abf1b12c9.tar.bz2 android_packages_apps_Dialer-bb293bfd56125febe42ddef5cdcb630abf1b12c9.zip | |
Merge "Fixing missed call notifications for FBE" into nyc-dev
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c02d0f561..c39bd5b6c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -69,8 +69,7 @@ android:supportsRtl="true" android:backupAgent='com.android.dialer.DialerBackupAgent' android:usesCleartextTraffic="false" - android:forceDeviceEncrypted="true" - android:encryptionAware="true"> + android:forceDeviceEncrypted="false"> <meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" /> @@ -86,6 +85,7 @@ android:icon="@mipmap/ic_launcher_phone" android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" android:resizeableActivity="true" + android:encryptionAware="true" > <intent-filter> <action android:name="android.intent.action.DIAL" /> @@ -281,10 +281,12 @@ <service android:name=".calllog.CallLogNotificationsService" + android:encryptionAware="true" android:exported="false" /> - <receiver android:name=".calllog.MissedCallNotificationReceiver"> + <receiver android:name=".calllog.MissedCallNotificationReceiver" + android:encryptionAware="true"> <intent-filter> <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" /> </intent-filter> @@ -318,11 +320,6 @@ android:resizeableActivity="true"> </activity> - <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> - <receiver android:name="com.android.incallui.NotificationBroadcastReceiver" - android:encryptionAware="true" - android:exported="false" /> - <service android:name="com.android.incallui.InCallServiceImpl" android:permission="android.permission.BIND_INCALL_SERVICE" android:encryptionAware="true" > @@ -334,6 +331,11 @@ </intent-filter> </service> + <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> + <receiver android:name="com.android.incallui.NotificationBroadcastReceiver" + android:encryptionAware="true" + android:exported="false" /> + <provider android:name=".database.FilteredNumberProvider" android:authorities="com.android.dialer.database.filterednumberprovider" |