commit cff7b2b4d57d398d38923a5dc84f817bf95ead06
author Brandon Maxwell <maxwelb@google.com> Wed Mar 02 20:13:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 02 20:13:58 2016 +0000
tree 6a75062e6b72248b6790fc042d75cf0e0fb5415d
parent 863640e4bf83a15d40dedf8d1b9d5e3c2f5b3c62
parent e5e5b4f6b7f77fdfaf231713e6c613c8162794cc

Merge "Fixing call notifications for FBE" into nyc-dev am: 27f6dbe2bb
am: e5e5b4f6b7

* commit 'e5e5b4f6b7f77fdfaf231713e6c613c8162794cc':
  Fixing call notifications for FBE

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbe4e1b..d23fca6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -314,6 +314,7 @@
 
         <!-- 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"