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

Commit aa7f92dc authored by Jeff Davidson's avatar Jeff Davidson Committed by android-build-merger
Browse files

Merge "Move eUICC permissions to com.android namespace." into oc-dr1-dev 

am: 3fc57019

Change-Id: Ic29ac9c37bfd6c39fadd53ae57fb289a2f858d5e
parents 702d82fd 3fc57019

core/res/AndroidManifest.xml

+4 −5
Original line number Diff line number Diff line
@@ -1705,19 +1705,18 @@ 
    <!-- Allows an application to manage embedded subscriptions (those on a eUICC) through

         EuiccManager APIs.

         <p>Protection level: signature|privileged|development

         TODO(b/35851809): Mark this as a SystemApi.

         TODO(b/35851809): Mark this as a SystemApi and remove com. prefix.

         @hide -->

    <permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

    <permission android:name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

                android:protectionLevel="signature|privileged|development" />



    <!-- Must be required by an EuiccService to ensure that only the system can bind to it.

         <p>Protection level: signature

         TODO(b/35851809): Mark this as a SystemApi.

         TODO(b/35851809): Mark this as a SystemApi and remove com. prefix.

         @hide -->

    <permission android:name="android.permission.BIND_EUICC_SERVICE"

    <permission android:name="com.android.permission.BIND_EUICC_SERVICE"

                android:protectionLevel="signature" />





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

    <!-- Permissions for sdcard interaction -->

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

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ applications that come with the platform 
        <permission name="android.permission.UPDATE_DEVICE_STATS"/>

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

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

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

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

        <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>

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

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

    </privapp-permissions>