summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-10-27 20:58:20 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-10-27 20:58:20 +0000
commite051e45b93f31ed4d31745668981fc91b01421af (patch)
tree8991aff54e0cd95bbcd9c805abc045ffc49db12e
parent2e349325beda37f33d2c1e29b152cabee4e62661 (diff)
parent61aaf28dd77f5d6fccd726aaa89bf8d6c5dd6243 (diff)
downloadplatform_packages_services_Telephony-android11-s1-release.tar.gz
platform_packages_services_Telephony-android11-s1-release.tar.bz2
platform_packages_services_Telephony-android11-s1-release.zip
Merge cherrypicks of [12932958, 12933116, 12932959, 12932960, 12933063, 12933064, 12932558, 12932852, 12932349, 12932649, 12932853, 12932854, 12932650, 12933102, 12932350, 12933103, 12933295, 12932351, 12932651, 12932652, 12933104, 12933105, 12933315, 12932584, 12933260, 12932559, 12933176, 12932560, 12932561, 12932352, 12932353] into sparse-6782484-L76100000728111977android-11.0.0_r25android11-s1-release
Change-Id: Id6bc36868f6bf01e195c310e4df8a4b749c28c73
-rw-r--r--AndroidManifest.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 425440a59..e8f9c3eec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,6 @@
<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" />