summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-03-02 17:59:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-02 17:59:48 +0000
commite5e5b4f6b7f77fdfaf231713e6c613c8162794cc (patch)
tree99eba80577d791caec3679f463a23c271e3cbe94
parent52472d95d0775080e808f9a48696c6b85ccd0543 (diff)
parent27f6dbe2bb366a3b56227b8a7919f91c6ed8afcc (diff)
Merge "Fixing call notifications for FBE" into nyc-dev
am: 27f6dbe2bb * commit '27f6dbe2bb366a3b56227b8a7919f91c6ed8afcc': Fixing call notifications for FBE
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbe4e1b0b..d23fca617 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"