Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65136ac6 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Keep read/write external storage as built-in permissions" into nyc-dev

parents 7239d957 e5313a84

data/etc/platform.xml

+14 −0
Original line number Diff line number Diff line
@@ -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" />



    <!-- ================================================================== -->

    <!-- ================================================================== -->

    <!-- ================================================================== -->

services/core/java/com/android/server/pm/Settings.java

+7 −3
Original line number Diff line number Diff line
@@ -2686,7 +2686,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);
@@ -3348,8 +3348,12 @@ final class Settings { 
                final String ptype = parser.getAttributeValue(null, "type");

                if (name != null && sourcePackage != null) {

                    final boolean dynamic = "dynamic".equals(ptype);

                    final BasePermission bp = new BasePermission(name.intern(), sourcePackage,

                    BasePermission bp = out.get(name);

                    // If the permission is builtin, do not clobber it.

                    if (bp == null || bp.type != BasePermission.TYPE_BUILTIN) {

                        bp = new BasePermission(name.intern(), sourcePackage,

                                dynamic ? BasePermission.TYPE_DYNAMIC : BasePermission.TYPE_NORMAL);

                    }

                    bp.protectionLevel = readInt(parser, null, "protection",

                            PermissionInfo.PROTECTION_NORMAL);

                    bp.protectionLevel = PermissionInfo.fixProtectionLevel(bp.protectionLevel);