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

Commit 5b9f6a59 authored by Jay Thomas Sullivan's avatar Jay Thomas Sullivan
Browse files

Add perm split W_E_S to A_M_L and sort 

Add a permission split:

    WRITE_EXTERNAL_STORAGE to ACCESS_MEDIA_LOCATION

...and sort split permissions.

The reason adding this is that the split-permission handling code
doesn't handle recursive split-permission mappings, but only direct
mappings.

The reason for sorting is that, given a tree of permission splits,
the entries in platform.xml must be sorted topologically, due to
current permission split code.

Bug: 227240947
Test: atest CtsPermissionTestCases CtsPermission3TestCases SplitPermissionsSystemTest
Change-Id: I62c2ab8687af2e8325fcc370a74af0f589d8e9f2
parent 97a605b1

data/etc/platform.xml

+30 −26
Original line number Original line Diff line number Diff line
@@ -223,37 +223,13 @@ 
                      targetSdk="29">

                      targetSdk="29">

        <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" />

        <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" />

    </split-permission>

    </split-permission>

    <split-permission name="android.permission.BODY_SENSORS"

                      targetSdk="33">

        <new-permission name="android.permission.BODY_SENSORS_BACKGROUND" />

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="29">

                      targetSdk="29">

        <new-permission name="android.permission.ACCESS_MEDIA_LOCATION" />

        <new-permission name="android.permission.ACCESS_MEDIA_LOCATION" />

    </split-permission>

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_AUDIO" />

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_VIDEO" />

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_IMAGES" />

    </split-permission>

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_AUDIO" />

    </split-permission>

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_VIDEO" />

    </split-permission>

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

                      targetSdk="33">

                      targetSdk="29">

        <new-permission name="android.permission.READ_MEDIA_IMAGES" />

        <new-permission name="android.permission.ACCESS_MEDIA_LOCATION" />

    </split-permission>

    </split-permission>

    <split-permission name="android.permission.BLUETOOTH"

    <split-permission name="android.permission.BLUETOOTH"

                      targetSdk="31">

                      targetSdk="31">
@@ -279,6 +255,34 @@ 
                      targetSdk="31">

                      targetSdk="31">

        <new-permission name="android.permission.BLUETOOTH_ADVERTISE" />

        <new-permission name="android.permission.BLUETOOTH_ADVERTISE" />

    </split-permission>

    </split-permission>

    <split-permission name="android.permission.BODY_SENSORS"

                      targetSdk="33">

        <new-permission name="android.permission.BODY_SENSORS_BACKGROUND" />

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_AUDIO" />

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_VIDEO" />

    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_IMAGES" />

    </split-permission>

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_AUDIO" />

    </split-permission>

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_VIDEO" />

    </split-permission>

    <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"

                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_IMAGES" />

    </split-permission>





    <!-- This is a list of all the libraries available for application

    <!-- This is a list of all the libraries available for application

         code to link against. -->

         code to link against. -->