diff options
| author | 2009-07-27 10:49:07 -0700 | |
|---|---|---|
| committer | 2009-07-27 10:49:07 -0700 | |
| commit | ba989ad0ed91beda010d44945fa015d75d99cf67 (patch) | |
| tree | 2d158a87d5884844cc3c4bb0609acf44f97c64bb | |
| parent | 5b11a0f3e1d8e2681cfd3326b6808b894bb9c2c3 (diff) | |
| parent | e7d1c8f3777375468de2e5932a691ef388ee2e75 (diff) | |
Merge change 8648 into donut
* changes:
Use the old string for bookmarks permissions.
| -rw-r--r-- | api/current.xml | 4 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index d56263fd4e5f..dd13db5d7fb3 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" diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 00d9cf6152e4..e16db615f6bc 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" |