summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-09-07 12:40:30 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-09-07 12:40:30 -0700
commit1d471d04a08fda31ab1dbe977f0ca86f750af3a1 (patch)
tree5eed69237c56eb8a947c8d205fd0a77efced7710
parent5aabd635529a06c72539a8a66e2566c21ec85eea (diff)
parentc76129b068e9fbe16ce129fe7b28943092d158a8 (diff)
downloadandroid_packages_services_Telephony-1d471d04a08fda31ab1dbe977f0ca86f750af3a1.tar.gz
android_packages_services_Telephony-1d471d04a08fda31ab1dbe977f0ca86f750af3a1.tar.bz2
android_packages_services_Telephony-1d471d04a08fda31ab1dbe977f0ca86f750af3a1.zip
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:27:12 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
-rw-r--r--AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 26f553ce4..be24d8874 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,6 +24,8 @@
<original-package android:name="com.android.phone" />
+ <protected-broadcast android:name="android.telecom.action.TTY_PREFERRED_MODE_CHANGED" />
+ <protected-broadcast android:name="android.telecom.action.CURRENT_TTY_MODE_CHANGED" />
<protected-broadcast android:name="android.intent.action.SERVICE_STATE" />
<protected-broadcast android:name="android.intent.action.RADIO_TECHNOLOGY" />
<protected-broadcast android:name="android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED" />