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

Commit 5c375eac authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "Add perm split W_E_S to A_M_L and sort" into tm-dev

parents 2cee2d3b 5b9f6a59
Loading
Loading
Loading
Loading
+30 −26
Original line number Diff line number Diff line
@@ -223,37 +223,13 @@
                      targetSdk="29">
        <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" />
    </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="29">
        <new-permission name="android.permission.ACCESS_MEDIA_LOCATION" />
    </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" />
                      targetSdk="29">
        <new-permission name="android.permission.ACCESS_MEDIA_LOCATION" />
    </split-permission>
    <split-permission name="android.permission.BLUETOOTH"
                      targetSdk="31">
@@ -279,6 +255,34 @@
                      targetSdk="31">
        <new-permission name="android.permission.BLUETOOTH_ADVERTISE" />
    </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
         code to link against. -->