From c528bd72f2259724611323df8b63700226efc401 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Fri, 21 Apr 2023 13:19:01 -0700
Subject: [PATCH] Allow telecom to bind to ICS for self-mgd calls

Also update javadoc to remove outdated information about self-managed
calls.

Bug: 279209119
Test: n/a
Change-Id: I6dba56f7afb8b383904a28042ad6e2a10e0a84b8
---
 core/res/AndroidManifest.xml                      | 2 ++
 telecomm/java/android/telecom/TelecomManager.java | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 11fcd1e248dbf..bfbce482d6b80 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -8219,6 +8219,8 @@
         <service android:name="com.android.server.companion.datatransfer.contextsync.CallMetadataSyncInCallService"
                  android:permission="android.permission.BIND_INCALL_SERVICE"
                  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>
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 9dd2a61671ecb..26590c4704c3e 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -744,10 +744,6 @@ public class TelecomManager {
      * state of calls in the self-managed {@link ConnectionService}.  An example use-case is
      * exposing these calls to an automotive device via its companion app.
      * <p>
-     * This meta-data can only be set for an {@link InCallService} which also sets
-     * {@link #METADATA_IN_CALL_SERVICE_UI}. Only the default phone/dialer app, or a car-mode
-     * {@link InCallService} can see self-managed calls.
-     * <p>
      * See also {@link Connection#PROPERTY_SELF_MANAGED}.
      */
     public static final String METADATA_INCLUDE_SELF_MANAGED_CALLS =