summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-08-21 12:34:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-21 12:34:37 +0000
commitcb59747de7222bc7310162c4174f7b460c34adef (patch)
tree36fdd130854f49c93b201d931213a6d7f22121aa /core/res
parent7cd2d3431c157fa20576e84a8a9f04ba4f7e1dd9 (diff)
parentf1418ae65be77a0d0fac1b616cc9901f9bceffc7 (diff)
downloadframeworks_base-cb59747de7222bc7310162c4174f7b460c34adef.zip
frameworks_base-cb59747de7222bc7310162c4174f7b460c34adef.tar.gz
frameworks_base-cb59747de7222bc7310162c4174f7b460c34adef.tar.bz2
Merge "Add missing removed permissions to the platform manifest" into mnc-dev
Diffstat (limited to 'core/res')
-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 629d14b..99e55bf 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 -->
<!-- ====================================================================== -->