commit 0c52af7a3e137f131dcec1c45589291296911a87
author Chiao Cheng <chiaocheng@google.com> Thu Nov 07 14:07:39 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 07 14:07:39 2013 -0800
tree b91ce25e110d6212cb7789c8a49660932d69369f
parent 4d228bd40010e3ffde13cdeddc684569edec8579
parent c406509012292c72d595b329a5cf2626eb668245

am c4065090: am 25441f56: Merge "Fix broadcast of CONTACTS_DATABASE_CREATED intent." into klp-dev

* commit 'c406509012292c72d595b329a5cf2626eb668245':
  Fix broadcast of CONTACTS_DATABASE_CREATED intent.

src/com/android/providers/contacts/ContactsDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 4cd01eb..068e595 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -1358,6 +1358,14 @@
 
         ContentResolver.requestSync(null /* all accounts */,
                 ContactsContract.AUTHORITY, new Bundle());
+
+        // Only send broadcasts for regular contacts db.
+        if (dbForProfile() == 0) {
+            final Intent dbCreatedIntent = new Intent(
+                    ContactsContract.Intents.CONTACTS_DATABASE_CREATED);
+            dbCreatedIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+            mContext.sendBroadcast(dbCreatedIntent, android.Manifest.permission.READ_CONTACTS);
+        }
     }
 
     protected void initializeAutoIncrementSequences(SQLiteDatabase db) {