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

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

Merge "Allow telecom to bind to ICS for self-mgd calls" into udc-dev am: 71fec872 

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



Change-Id: Iaf421a626640bbccaacbe6cef3fcadfebd5c2803
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5cecbd5 71fec872

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -8228,6 +8228,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>

telecomm/java/android/telecom/TelecomManager.java

+0 −4
Original line number Diff line number Diff line
@@ -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 =