commit ba989ad0ed91beda010d44945fa015d75d99cf67
author Android (Google) Code Review <android-gerrit@google.com> Mon Jul 27 10:49:07 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 27 10:49:07 2009 -0700
tree 2d158a87d5884844cc3c4bb0609acf44f97c64bb
parent 5b11a0f3e1d8e2681cfd3326b6808b894bb9c2c3
parent e7d1c8f3777375468de2e5932a691ef388ee2e75

Merge change 8648 into donut

* changes:
  Use the old string for bookmarks permissions.

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index d56263f..dd13db5 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -698,7 +698,7 @@
  type="java.lang.String"
  transient="false"
  volatile="false"
- value=""android.permission.READ_HISTORY_BOOKMARKS""
+ value=""com.android.browser.permission.READ_HISTORY_BOOKMARKS""
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1160,7 +1160,7 @@
  type="java.lang.String"
  transient="false"
  volatile="false"
- value=""android.permission.WRITE_HISTORY_BOOKMARKS""
+ value=""com.android.browser.permission.WRITE_HISTORY_BOOKMARKS""
  static="true"
  final="true"
  deprecated="not deprecated"

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 00d9cf6..e16db61 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -209,7 +209,7 @@
 
     <!-- Allows an application to read (but not write) the user's
         browsing history and bookmarks. -->
-    <permission android:name="android.permission.READ_HISTORY_BOOKMARKS"
+    <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
         android:permissionGroup="android.permission-group.PERSONAL_INFO"
         android:label="@string/permlab_readHistoryBookmarks"
         android:description="@string/permdesc_readHistoryBookmarks"
@@ -217,7 +217,7 @@
 
     <!-- Allows an application to write (but not read) the user's
         browsing history and bookmarks. -->
-    <permission android:name="android.permission.WRITE_HISTORY_BOOKMARKS"
+    <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"
         android:permissionGroup="android.permission-group.PERSONAL_INFO"
         android:label="@string/permlab_writeHistoryBookmarks"
         android:description="@string/permdesc_writeHistoryBookmarks"