summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2016-01-14 06:26:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-14 06:26:26 +0000
commit06067b94b092a3d6f422386bf3ec6d70771a5616 (patch)
tree5934395401f20fb469facf2fea4c3592795d66b9
parent03ccc5bcfb494261708f4873d19a53d35a964439 (diff)
parent0d952587ed4681ae8b3fdb6582790c7ca9c15555 (diff)
downloadplatform_packages_services_Telephony-marshmallow-dr1.5-dev.tar.gz
platform_packages_services_Telephony-marshmallow-dr1.5-dev.tar.bz2
platform_packages_services_Telephony-marshmallow-dr1.5-dev.zip
Merge "DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected" into mnc-dr1.5-devandroid-6.0.1_r22android-6.0.1_r21marshmallow-dr1.5-dev
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b8225c93e..2d449ad0a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,6 +27,7 @@
<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" />
+ <protected-broadcast android:name="android.intent.action.EMERGENCY_CALL_STATE_CHANGED" />
<protected-broadcast android:name="android.intent.action.SIG_STR" />
<protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" />
<protected-broadcast android:name="android.intent.action.DATA_CONNECTION_FAILED" />