commit f183b438a88976dfcb6c4c54dfb425540230edba
author Evan Charlton <evanc@google.com> Fri Mar 07 18:55:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 07 18:55:26 2014 +0000
tree 70f817ef9817a253b8c914f58ac64cb4362ff38d
parent b973735e26ef59ad6d3f60843d07d5e4554bbd6f
parent 28df73874d7b9bf0d14eca6f57e8e36f0b465760

Merge "Neuter Telephony app" into master-nova

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2b5c0c8..7e8648c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -153,6 +153,7 @@
         </activity>
 
         <activity android:name="OutgoingCallBroadcaster"
+                android:enabled="false"
                 android:theme="@style/OutgoingCallBroadcasterTheme"
                 android:permission="android.permission.CALL_PHONE"
                 android:screenOrientation="nosensor"
@@ -185,6 +186,7 @@
         </activity>
 
         <activity-alias android:name="EmergencyOutgoingCallBroadcaster"
+                android:enabled="false"
                 android:targetActivity="OutgoingCallBroadcaster"
                 android:permission="android.permission.CALL_PRIVILEGED">
             <intent-filter android:priority="1000">
@@ -212,6 +214,7 @@
         </activity-alias>
 
         <activity-alias android:name="PrivilegedOutgoingCallBroadcaster"
+                android:enabled="false"
                 android:targetActivity="OutgoingCallBroadcaster"
                 android:screenOrientation="nosensor"
                 android:permission="android.permission.CALL_PRIVILEGED">