commit 9370f24e801d8ad6d8e08be1f20301fe15301b55
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 30 01:51:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 30 01:51:56 2017 +0000
tree 5068155c5daa992ac9736d93e1f69789f4c781f7
parent e01c4280c32b930a3d7fb2e98a8ec52549ec36bc
parent 24e830ff335038184eaa66c14a5175fc4dfd8650

Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4022754..bc1c448 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,7 +40,7 @@
     <protected-broadcast android:name="android.intent.action.SIM_STATE_CHANGED" />
     <protected-broadcast android:name="android.intent.action.NETWORK_SET_TIME" />
     <protected-broadcast android:name="android.intent.action.NETWORK_SET_TIMEZONE" />
-    <protected-broadcast android:name="android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
+    <protected-broadcast android:name="com.android.internal.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
     <protected-broadcast android:name="android.intent.action.ACTION_MDN_STATE_CHANGED" />
     <protected-broadcast android:name="android.provider.Telephony.SPN_STRINGS_UPDATED" />
     <protected-broadcast android:name="android.provider.Telephony.SIM_FULL" />
@@ -491,7 +491,7 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
                 <action android:name="com.android.phone.action.ACTION_SHOW_ECM_EXIT_DIALOG" />
-                <action android:name="android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
+                <action android:name="com.android.internal.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>