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

Commit 4487b40f authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Support platform-compat-framework for TeleService" am: 7ad8aa92 am:... 

Merge "Support platform-compat-framework for TeleService" am: 7ad8aa92 am: 2e7d4fe9 am: 02adf2d9

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

Change-Id: Ia630dfdba5e445597aaaa9c6bb58aa5a71acb873
parents 0989938d 02adf2d9

Android.bp

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

        "protolog.conf.json.gz",

        "services-platform-compat-config",

        "TeleService-platform-compat-config",

        "documents-ui-compat-config",

        "calendar-provider-compat-config",

    ],

data/etc/privapp-permissions-platform.xml

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

        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>

        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>

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

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

    </privapp-permissions>



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