diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-21 12:49:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 12:49:42 +0000 |
commit | e96b80f3deb7a49225112d497dcf75cc4211b092 (patch) | |
tree | 57b73f7d215a295551653ee345a26498f43a1034 | |
parent | 36970140f3ce6ce66f3873e2091841f97efdd390 (diff) | |
parent | 446c00a2919da5b4ea0bdf08f72ac4f95125ea45 (diff) | |
download | frameworks_base-e96b80f3deb7a49225112d497dcf75cc4211b092.zip frameworks_base-e96b80f3deb7a49225112d497dcf75cc4211b092.tar.gz frameworks_base-e96b80f3deb7a49225112d497dcf75cc4211b092.tar.bz2 |
am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev
* commit '446c00a2919da5b4ea0bdf08f72ac4f95125ea45':
Add missing removed permissions to the platform manifest
-rw-r--r-- | core/res/AndroidManifest.xml | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 03bc9c6..86659ae 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -788,6 +788,46 @@ android:protectionLevel="normal" android:permissionFlags="hidden"/> + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.WRITE_SMS" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.MANAGE_ACCOUNTS" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.USE_CREDENTIALS" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.SUBSCRIBED_FEEDS_WRITE" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + <!-- ====================================================================== --> <!-- INSTALL PERMISSIONS --> <!-- ====================================================================== --> |