Merge "Made broadcast EXTERNAL_PROVIDER_CHANGE protected and with FLAG_RECEIVER_REPLACE_PENDING." into nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 06a331c..88acca2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,6 +24,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+ <protected-broadcast android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" />
<!-- This permission is only used to send the ACTION_EXTERNAL_PROVIDER_CHANGE intent. -->
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
diff --git a/src/com/android/providers/telephony/ProviderUtil.java b/src/com/android/providers/telephony/ProviderUtil.java
index 7f5a2bd..7053e9a 100644
--- a/src/com/android/providers/telephony/ProviderUtil.java
+++ b/src/com/android/providers/telephony/ProviderUtil.java
@@ -101,6 +101,7 @@
final Intent intent =
new Intent(Telephony.Sms.Intents.ACTION_EXTERNAL_PROVIDER_CHANGE);
+ intent.setFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
intent.setComponent(componentName);
if (uri != null) {
intent.setData(uri);