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

Commit 893f20ad authored by Christine Franks's avatar Christine Franks Committed by Automerger Merge Worker
Browse files

Merge "Allow context sync to make emergency calls" into udc-dev am: a23febe1 

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



Change-Id: I99daa7fa069007e020bfab87521218b8eb17592d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ccaf599 a23febe1

core/res/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ 
        android:label="@string/permlab_readContacts"

        android:description="@string/permdesc_readContacts"

        android:protectionLevel="dangerous" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />



    <!-- Allows an application to write the user's contacts data.

         <p>Protection level: dangerous
@@ -6039,6 +6040,7 @@ 
         <p>Not for use by third-party applications. -->

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

        android:protectionLevel="signature|privileged" />

    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />



    <!-- @SystemApi Allows an application to perform CDMA OTA provisioning @hide -->

    <permission android:name="android.permission.PERFORM_CDMA_PROVISIONING"
@@ -8231,7 +8233,7 @@ 
        </service>



        <service android:name="com.android.server.companion.datatransfer.contextsync.CallMetadataSyncConnectionService"

                 android:permission="android.permission.BIND_CONNECTION_SERVICE"

                 android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"

                 android:exported="true">

            <intent-filter>

                <action android:name="android.telecom.ConnectionService"/>