summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-03-02 20:13:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-02 20:13:58 +0000
commitcff7b2b4d57d398d38923a5dc84f817bf95ead06 (patch)
tree6a75062e6b72248b6790fc042d75cf0e0fb5415d
parent863640e4bf83a15d40dedf8d1b9d5e3c2f5b3c62 (diff)
parente5e5b4f6b7f77fdfaf231713e6c613c8162794cc (diff)
Merge "Fixing call notifications for FBE" into nyc-dev am: 27f6dbe2bb
am: e5e5b4f6b7 * commit 'e5e5b4f6b7f77fdfaf231713e6c613c8162794cc': 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"