diff options
| -rw-r--r-- | data/etc/platform.xml | 14 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index d412d7c5aa33..8a7d39b65edd 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -111,6 +111,20 @@ <group gid="media" /> </permission> + <!-- These are permissions that were mapped to gids but we need + to keep them here until an upgrade from L to the current + version is to be supported. These permissions are built-in + and in L were not stored in packages.xml as a result if they + are not defined here while parsing packages.xml we would + ignore these permissions being granted to apps and not + propagate the granted state. From N we are storing the + built-in permissions in packages.xml as the saved storage + is negligible (one tag with the permission) compared to + the fragility as one can remove a built-in permission which + no longer needs to be mapped to gids and break grant propagation. --> + <permission name="android.permission.READ_EXTERNAL_STORAGE" /> + <permission name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <!-- ================================================================== --> <!-- ================================================================== --> <!-- ================================================================== --> diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 3c3c576f2587..4891af3359d8 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -2672,7 +2672,7 @@ final class Settings { void writePermissionLPr(XmlSerializer serializer, BasePermission bp) throws XmlPullParserException, java.io.IOException { - if (bp.type != BasePermission.TYPE_BUILTIN && bp.sourcePackage != null) { + if (bp.sourcePackage != null) { serializer.startTag(null, TAG_ITEM); serializer.attribute(null, ATTR_NAME, bp.name); serializer.attribute(null, "package", bp.sourcePackage); |