diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-06-14 20:00:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-14 20:01:02 +0000 |
| commit | 6d9778328a3c3c9da525870fff606af8ac5e9529 (patch) | |
| tree | 349a1b9328b9591ce2c092e941a24d328f215e61 /core/res | |
| parent | a5c852e03abb9372a6928271a930d7d79e4ec45e (diff) | |
| parent | bfa216ac261dd3c5035ad38795650ce5f4ce6fb7 (diff) | |
| download | frameworks_base-6d9778328a3c3c9da525870fff606af8ac5e9529.zip frameworks_base-6d9778328a3c3c9da525870fff606af8ac5e9529.tar.gz frameworks_base-6d9778328a3c3c9da525870fff606af8ac5e9529.tar.bz2 | |
Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 30 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 1 |
2 files changed, 1 insertions, 30 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8a79f5a..a434a13 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -809,36 +809,6 @@ android:protectionLevel="normal"/> <!-- =============================================================== --> - <!-- Permissions for accessing the user bookmarks --> - <!-- =============================================================== --> - <eat-comment /> - - <!-- Used for permissions that provide access to the user - bookmarks and browser history.--> - <permission-group android:name="android.permission-group.BOOKMARKS" - android:label="@string/permgrouplab_bookmarks" - android:icon="@drawable/perm_group_bookmarks" - android:description="@string/permgroupdesc_bookmarks" - android:permissionGroupFlags="personalInfo" - android:priority="1200" /> - - <!-- Allows an application to read (but not write) the user's - browsing history and bookmarks. --> - <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" - android:permissionGroup="android.permission-group.BOOKMARKS" - android:label="@string/permlab_readHistoryBookmarks" - android:description="@string/permdesc_readHistoryBookmarks" - android:protectionLevel="dangerous" /> - - <!-- Allows an application to write (but not read) the user's - browsing history and bookmarks. --> - <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" - android:permissionGroup="android.permission-group.BOOKMARKS" - android:label="@string/permlab_writeHistoryBookmarks" - android:description="@string/permdesc_writeHistoryBookmarks" - android:protectionLevel="dangerous" /> - - <!-- =============================================================== --> <!-- Permissions for setting the device alarm --> <!-- =============================================================== --> <eat-comment /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f3d559a..703a086 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2259,6 +2259,7 @@ <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE] --> <string name="autofill_emirate">Emirate</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 your Web bookmarks and history</string> |