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

Commit 6ca4e096 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Move offered RTP header extenions to MmtelFeature. am: f026a1cb am:... 

Move offered RTP header extenions to MmtelFeature. am: f026a1cb am: 5970d614 am: d0082f14 am: 836357de

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1497158

Change-Id: I1524f8f0d9087fb01bb614e284590f4b5239ad3e
parents cbaa692c 836357de

src/java/com/android/ims/ImsManager.java

+24 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.ims;



import android.annotation.NonNull;

import android.app.PendingIntent;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -41,6 +42,7 @@ import android.telephony.ims.ImsReasonInfo; 
import android.telephony.ims.ImsService;

import android.telephony.ims.ProvisioningManager;

import android.telephony.ims.RegistrationManager;

import android.telephony.ims.RtpHeaderExtensionType;

import android.telephony.ims.aidl.IImsCapabilityCallback;

import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsConfigCallback;
@@ -66,6 +68,7 @@ import com.android.telephony.Rlog; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Set;

import java.util.concurrent.BlockingQueue;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.Executor;
@@ -2029,6 +2032,27 @@ public class ImsManager implements FeatureUpdates { 
        }

    }



    /**

     * Informs the {@link ImsService} of the {@link RtpHeaderExtensionType}s which the framework

     * intends to use for incoming and outgoing calls.

     * <p>

     * See {@link RtpHeaderExtensionType} for more information.

     * @param types The RTP header extension types to use for incoming and outgoing calls, or

     *              empty list if none defined.

     * @throws ImsException

     */

    public void setOfferedRtpHeaderExtensionTypes(@NonNull Set<RtpHeaderExtensionType> types)

            throws ImsException {

        MmTelFeatureConnection c = getOrThrowExceptionIfServiceUnavailable();



        try {

            c.changeOfferedRtpHeaderExtensionTypes(types);

        } catch (RemoteException e) {

            throw new ImsException("setOfferedRtpHeaderExtensionTypes()", e,

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

        }

    }



    /**

     * Creates a {@link ImsCall} to make a call.

     *

src/java/com/android/ims/MmTelFeatureConnection.java

+13 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.RemoteException; 
import android.telephony.TelephonyManager;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsService;

import android.telephony.ims.RtpHeaderExtensionType;

import android.telephony.ims.aidl.IImsCapabilityCallback;

import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsConfigCallback;
@@ -44,6 +45,9 @@ import com.android.ims.internal.IImsMultiEndpoint; 
import com.android.ims.internal.IImsUt;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Set;



/**

 * A container of the IImsServiceController binder, which implements all of the ImsFeatures that

 * the platform currently supports: MMTel
@@ -342,6 +346,15 @@ public class MmTelFeatureConnection extends FeatureConnection { 
        }

    }



    public void changeOfferedRtpHeaderExtensionTypes(Set<RtpHeaderExtensionType> types)

            throws RemoteException {

        synchronized (mLock) {

            checkServiceIsReady();

            getServiceInterface(mBinder).changeOfferedRtpHeaderExtensionTypes(

                    new ArrayList<>(types));

        }

    }



    public IImsCallSession createCallSession(ImsCallProfile profile)

            throws RemoteException {

        synchronized (mLock) {