summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-08-21 12:41:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 12:41:29 +0000
commit446c00a2919da5b4ea0bdf08f72ac4f95125ea45 (patch)
tree39f42eb2e1eddd1881b48351caadcf9e2bfb619a
parent79cb3ef99eec49df785c1b93a743db32c1388af8 (diff)
parentcb59747de7222bc7310162c4174f7b460c34adef (diff)
downloadframeworks_base-446c00a2919da5b4ea0bdf08f72ac4f95125ea45.zip
frameworks_base-446c00a2919da5b4ea0bdf08f72ac4f95125ea45.tar.gz
frameworks_base-446c00a2919da5b4ea0bdf08f72ac4f95125ea45.tar.bz2
am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev
* commit 'cb59747de7222bc7310162c4174f7b460c34adef': Add missing removed permissions to the platform manifest
-rw-r--r--core/res/AndroidManifest.xml40
1 files changed, 40 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 58f2d47..b60fdba 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -786,6 +786,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 -->
<!-- ====================================================================== -->