commit 1963c1b200b7300cd38e29d9bb7fcd0ac04b91f1
author Leon Scroggins <scroggo@google.com> Mon Jul 27 10:50:48 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 27 10:50:48 2009 -0700
tree 7e802ae18f07006f8491d614aae2519e3374fc94
parent eeb67b085404f8da3efc17706a4a9c0afede556e
parent 04b2e8e1688a869904ecedafa58349b14a73ba48

am 04b2e8e1: Use the old string for bookmarks permissions.

Merge commit '04b2e8e1688a869904ecedafa58349b14a73ba48'

* commit '04b2e8e1688a869904ecedafa58349b14a73ba48':
  Use the old string for bookmarks permissions.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c0eba8b..f3707d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,8 +28,8 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.READ_HISTORY_BOOKMARKS"/>
-    <uses-permission android:name="android.permission.WRITE_HISTORY_BOOKMARKS"/>
+    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
+    <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
 
     <application   android:name="Browser"
                    android:label="@string/application_name"
@@ -40,8 +40,8 @@
         <provider android:name="BrowserProvider"
                   android:authorities="browser"
                   android:multiprocess="true"
-                  android:readPermission="android.permission.READ_HISTORY_BOOKMARKS"
-                  android:writePermission="android.permission.WRITE_HISTORY_BOOKMARKS">
+                  android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
+                  android:writePermission="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS">
             <path-permission android:path="/bookmarks/search_suggest_query"
                     android:readPermission="android.permission.GLOBAL_SEARCH" />
         </provider>