Merge "Allow context sync to make emergency calls" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a23febe1a8
@@ -863,6 +863,7 @@
|
|||||||
android:label="@string/permlab_readContacts"
|
android:label="@string/permlab_readContacts"
|
||||||
android:description="@string/permdesc_readContacts"
|
android:description="@string/permdesc_readContacts"
|
||||||
android:protectionLevel="dangerous" />
|
android:protectionLevel="dangerous" />
|
||||||
|
<uses-permission android:name="android.permission.READ_CONTACTS" />
|
||||||
|
|
||||||
<!-- Allows an application to write the user's contacts data.
|
<!-- Allows an application to write the user's contacts data.
|
||||||
<p>Protection level: dangerous
|
<p>Protection level: dangerous
|
||||||
@@ -6039,6 +6040,7 @@
|
|||||||
<p>Not for use by third-party applications. -->
|
<p>Not for use by third-party applications. -->
|
||||||
<permission android:name="android.permission.CALL_PRIVILEGED"
|
<permission android:name="android.permission.CALL_PRIVILEGED"
|
||||||
android:protectionLevel="signature|privileged" />
|
android:protectionLevel="signature|privileged" />
|
||||||
|
<uses-permission android:name="android.permission.CALL_PRIVILEGED" />
|
||||||
|
|
||||||
<!-- @SystemApi Allows an application to perform CDMA OTA provisioning @hide -->
|
<!-- @SystemApi Allows an application to perform CDMA OTA provisioning @hide -->
|
||||||
<permission android:name="android.permission.PERFORM_CDMA_PROVISIONING"
|
<permission android:name="android.permission.PERFORM_CDMA_PROVISIONING"
|
||||||
@@ -8231,7 +8233,7 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service android:name="com.android.server.companion.datatransfer.contextsync.CallMetadataSyncConnectionService"
|
<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">
|
android:exported="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.telecom.ConnectionService"/>
|
<action android:name="android.telecom.ConnectionService"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user