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

Commit 8ad880a4 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 am: 893f20ad 

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



Change-Id: I8a5ea73f5b123848672c660962cf0564556c791c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 946f5e8e 893f20ad

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
@@ -6047,6 +6048,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"
@@ -8239,7 +8241,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"/>