Use public bookmark permissions.
Depends on change https://android-git.corp.google.com/g/4775,
which adds bookmark permissions the the public API. This
change removes the old private permissions and uses the
new public ones.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f64b67a..6362cfa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,22 +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="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
- <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
-
- <!-- Allows an application to read the user Browser's history and 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"
- android:protectionLevel="dangerous" />
-
- <!-- Allows an application to write (but not read) the user Browser's history and 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"
- android:protectionLevel="dangerous" />
+ <uses-permission android:name="android.permission.READ_HISTORY_BOOKMARKS"/>
+ <uses-permission android:name="android.permission.WRITE_HISTORY_BOOKMARKS"/>
<supports-density android:density="160" />
<supports-density android:density="240" />
@@ -57,8 +43,8 @@
<provider android:name="BrowserProvider"
android:authorities="browser"
android:multiprocess="true"
- android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
- android:writePermission="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
+ android:readPermission="android.permission.READ_HISTORY_BOOKMARKS"
+ android:writePermission="android.permission.WRITE_HISTORY_BOOKMARKS"/>
<activity android:name="BrowserActivity"
android:label="@string/application_name"
android:launchMode="singleTask"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 253efc1..1e5429f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -636,20 +636,18 @@
<!-- The description of the suggestion that lets the user search the web for the query currently
in the text field. -->
<string name="search_the_web">Search the web</string>
-
- <!-- Title of an application permission, listed so the user can choose whether
- they want to allow the application to do this. -->
- <string name="permlab_readHistoryBookmarks">read Browser\'s history and bookmarks</string>
- <!-- Description of an application permission, listed so the user can choose whether
- they want to allow the application to do this. -->
- <string name="permdesc_readHistoryBookmarks">Allows the application to read all
- the URLs that the Browser has visited, and all of the Browser\'s bookmarks.</string>
- <!-- Title of an application permission, listed so the user can choose whether
- they want to allow the application to do this. -->
+ <!-- FIXME: the next four strings(read/write history permissions) should be removed.
+ At the moment actually removing them requires manually deleting all of the
+ existing translations. -->
+ <!-- Do not translate -->
+ <string name="permlab_readHistoryBookmarks">read Browser\'s history and bookmarks</string>
+ <!-- Do not translate -->
+ <string name="permdesc_readHistoryBookmarks">Allows the application to read all
+ the URLs that the Browser has visited, and all of the Browser\'s bookmarks.</string>
+ <!-- Do not translate -->
<string name="permlab_writeHistoryBookmarks">write Browser\'s history and bookmarks</string>
- <!-- Description of an application permission, listed so the user can choose whether
- they want to allow the application to do this. -->
+ <!-- Do not translate -->
<string name="permdesc_writeHistoryBookmarks">Allows an application to modify the
Browser\'s history or bookmarks stored on your phone. Malicious applications
can use this to erase or modify your Browser\'s data.</string>