Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ba989ad0: Merge change 8648 into donut

Browse Source 
Merge commit 'ba989ad0ed91beda010d44945fa015d75d99cf67'

* commit 'ba989ad0ed91beda010d44945fa015d75d99cf67':
  Use the old string for bookmarks permissions.
This commit is contained in:
Android (Google) Code Review
2009-07-27 10:50:53 -07:00
committed by Android Git Automerger
parent 461628716e ba989ad0ed
commit 143a2ce1ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.xml
View File

@@ -731,7 +731,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"
@@ -1204,7 +1204,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"

4
core/res/AndroidManifest.xml
View File

@@ -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"