commit dd22dec74cbe65876f83a57dd17498920e79aa05
author Dianne Hackborn <hackbod@google.com> Thu Jul 09 12:36:45 2009 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Jul 09 12:36:45 2009 -0700
tree 1928a0316554d6155cb80a6b1e906d87f308edfa
parent 28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c
parent c885d11f9f4748cd11973a5fb7143d8918fe0c01

resolved conflicts for merge of c885d11f to master

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4491dd6..30b89a3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,10 @@
             android:authorities="contacts;call_log"
             android:syncable="false" android:multiprocess="false"
             android:readPermission="android.permission.READ_CONTACTS"
-            android:writePermission="android.permission.WRITE_CONTACTS" />
+            android:writePermission="android.permission.WRITE_CONTACTS">
+            <path-permission android:path="/people/search_suggest_query"
+                    android:readPermission="android.permission.GLOBAL_SEARCH" />
+        </provider>
 
         <provider android:name="ContactsProvider2"
             android:authorities="com.android.contacts"