Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Add READ/WRITE_CONTACTS permissions to ContactsProvider
Update calllogbackup's new package name.
Change-Id: Iaf7592894b66ac88a773a71477ce8a7b67b4faf7
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 @@
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);