summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-07 16:59:22 -0800
committerSteve Kondik <steve@cyngn.com>2015-12-07 16:59:22 -0800
commit7394f186d54d676516bd2766be39ab8182d1614e (patch)
tree2812f0377acba0e22619329aa373a90acbc57c1b
parent74bd5101646680796c322424598df26b66f0caf6 (diff)
parentade78bd70affa0d5963a998152646f55dfe24bf5 (diff)
downloadpackages_providers_ContactsProvider-7394f186d54d676516bd2766be39ab8182d1614e.zip
packages_providers_ContactsProvider-7394f186d54d676516bd2766be39ab8182d1614e.tar.gz
packages_providers_ContactsProvider-7394f186d54d676516bd2766be39ab8182d1614e.tar.bz2
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into HEAD
Android 6.0.1 release 3
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/com/android/providers/contacts/DbModifierWithNotification.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4eb2bdf..4e035f9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,10 +8,12 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.PROCESS_PHONE_ACCOUNT_REGISTRATION" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.SEND_CALL_LOG_CHANGE" />
<uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
+ <uses-permission android:name="android.permission.WRITE_CONTACTS" />
<permission
android:name="android.permission.SEND_CALL_LOG_CHANGE"
diff --git a/src/com/android/providers/contacts/DbModifierWithNotification.java b/src/com/android/providers/contacts/DbModifierWithNotification.java
index 23a4333..1820ae8 100644
--- a/src/com/android/providers/contacts/DbModifierWithNotification.java
+++ b/src/com/android/providers/contacts/DbModifierWithNotification.java
@@ -130,8 +130,8 @@ public class DbModifierWithNotification implements DatabaseModifier {
mContext.getContentResolver().notifyChange(Calls.CONTENT_URI, null, false);
Intent intent = new Intent("android.intent.action.CALL_LOG_CHANGE");
- intent.setComponent(new ComponentName("com.android.providers.calllogbackup",
- "com.android.providers.calllogbackup.CallLogChangeReceiver"));
+ intent.setComponent(new ComponentName("com.android.calllogbackup",
+ "com.android.calllogbackup.CallLogChangeReceiver"));
if (!mContext.getPackageManager().queryBroadcastReceivers(intent, 0).isEmpty()) {
mContext.sendBroadcast(intent);