diff options
| author | 2024-11-21 22:15:09 +0000 | |
|---|---|---|
| committer | 2024-11-21 22:15:09 +0000 | |
| commit | 3ea82cd504d89d2c23f17ecea2d6f5fc5bb9457e (patch) | |
| tree | 35731b5357b5a9a640cdf4d8d4d31187b23530f4 | |
| parent | 058d13a4c40f707e9d477db5ddc7a5d416c1b637 (diff) | |
| parent | 02e76f7a48d0ab95056d567a5b5774aeaef95a25 (diff) | |
Merge "Add Ecm Incall permission, add new InCallService to system server" into main
| -rw-r--r-- | core/java/android/permission/flags.aconfig | 4 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index 55ba4afc9c68..a653e0a493ee 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -58,7 +58,7 @@ flag { is_fixed_read_only: true namespace: "permissions" description: "enable enhanced confirmation incall apis" - bug: "310220212" + bug: "364535720" } flag { @@ -67,7 +67,7 @@ flag { is_fixed_read_only: true namespace: "permissions" description: "enable the blocking of certain app installs during an unknown call" - bug: "310220212" + bug: "364535720" } flag { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a13e334e28c8..d8308aecfdc8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -9351,6 +9351,17 @@ </intent-filter> </service> + <service android:name="com.android.ecm.EnhancedConfirmationCallTrackerService" + android:permission="android.permission.BIND_INCALL_SERVICE" + android:featureFlag="android.permission.flags.enhanced_confirmation_in_call_apis_enabled" + android:exported="true"> + <meta-data android:name="android.telecom.INCLUDE_SELF_MANAGED_CALLS" + android:value="true" /> + <intent-filter> + <action android:name="android.telecom.InCallService"/> + </intent-filter> + </service> + <service android:name="com.android.server.companion.datatransfer.contextsync.CallMetadataSyncConnectionService" android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" android:exported="true"> |