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

Commit f8d93132 authored by Marcus Hagerott's avatar Marcus Hagerott Committed by Automerger Merge Worker
Browse files

Merge "Allow ContactsProvider to use compat change framework" am: 911df4f5... 

Merge "Allow ContactsProvider to use compat change framework" am: 911df4f5 am: 36f5ca19 am: fa2c7f2e am: e1434990

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I9ba64b458e2dee813afd57cae0fcc3c4420b78e6
parents fe2dfc50 e1434990

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ java_defaults { 
        "TeleService-platform-compat-config",

        "documents-ui-compat-config",

        "calendar-provider-compat-config",

        "contacts-provider-platform-compat-config",

    ],

    libs: [

        "app-compat-annotations",

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ applications that come with the platform 
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />

        <permission name="android.permission.LOG_COMPAT_CHANGE" />

    </privapp-permissions>



    <privapp-permissions package="com.android.providers.downloads">