commit cff9a48da8ed6a076240b0f43418bb42ea500491
author Yorke Lee <yorkelee@google.com> Fri Aug 08 23:05:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 08 23:05:52 2014 +0000
tree 6860404332adee64458f8629ab7f1352b37f3d8c
parent 1b89eaed356b7b38f768bce5df258ff66f4d1260
parent fe1156f671fadb4dc2302634793f5fbf18423ce7

am fe1156f6: Add authority for ProfileProvider to fix CP2 NPE at startup

* commit 'fe1156f671fadb4dc2302634793f5fbf18423ce7':
  Add authority for ProfileProvider to fix CP2 NPE at startup

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

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 948fd9a..049df45 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -1496,6 +1496,7 @@
         ProviderInfo profileInfo = new ProviderInfo();
         profileInfo.readPermission = "android.permission.READ_PROFILE";
         profileInfo.writePermission = "android.permission.WRITE_PROFILE";
+        profileInfo.authority = ContactsContract.AUTHORITY;
         mProfileProvider.attachInfo(getContext(), profileInfo);
         mProfileHelper = mProfileProvider.getDatabaseHelper(getContext());