summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-03-02 17:53:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-02 17:53:25 +0000
commit27f6dbe2bb366a3b56227b8a7919f91c6ed8afcc (patch)
tree6767957eb8eeb4dc15e7baa0332ad91b8a44cd87
parent1b686edac2b53551d114c45518054b7cbd073750 (diff)
parent4d24a6c6f1b64af9dae478c3cb69ba40fd204648 (diff)
Merge "Fixing call notifications for FBE" into nyc-dev
-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"