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

Commit a6ab62ff authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Change ImsService namespaces am: ed69077f 

am: baf64e04

Change-Id: If04ebb1b2f440a19b4bb68ccb49c049e70dad1e0
parents 6c96d2cb baf64e04

src/java/com/android/ims/ImsCall.java

+6 −1
Original line number Diff line number Diff line
@@ -36,10 +36,15 @@ import java.util.Objects; 
import java.util.concurrent.atomic.AtomicInteger;



import android.telephony.ServiceState;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsConferenceState;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.ImsStreamMediaProfile;

import android.telephony.ims.ImsSuppServiceNotification;

import android.util.Log;



import com.android.ims.internal.ICall;

import com.android.ims.internal.ImsCallSession;

import android.telephony.ims.ImsCallSession;

import com.android.ims.internal.ImsStreamMediaSession;

import com.android.internal.annotations.VisibleForTesting;

src/java/com/android/ims/ImsConnectionStateListener.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.ims;



import android.net.Uri;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

src/java/com/android/ims/ImsEcbm.java

+1 −7
Original line number Diff line number Diff line
@@ -29,18 +29,12 @@ 


package com.android.ims;



import java.util.HashMap;

import java.util.Map;



import android.os.AsyncResult;

import android.os.Bundle;

import android.os.Message;

import android.os.RemoteException;

import android.telephony.Rlog;

import android.telephony.ims.ImsReasonInfo;



import com.android.ims.internal.IImsEcbm;

import com.android.ims.internal.IImsEcbmListener;

import com.android.ims.ImsEcbmStateListener;



/**

 * Provides APIs for the supplementary service settings using IMS (Ut interface).

src/java/com/android/ims/ImsExternalCallStateListener.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.ims;



import android.telephony.ims.ImsExternalCallState;



import java.util.List;



/**

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

+4 −12
Original line number Diff line number Diff line
@@ -31,24 +31,24 @@ import android.os.RemoteException; 
import android.os.SystemProperties;

import android.telecom.TelecomManager;

import android.telephony.CarrierConfigManager;

import android.telephony.ims.internal.feature.ImsFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsSmsListener;

import android.telephony.ims.feature.CapabilityChangeRequest;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.util.Log;



import com.android.ims.internal.IImsCallSession;

import com.android.ims.internal.IImsEcbm;

import com.android.ims.internal.IImsMultiEndpoint;

import com.android.ims.internal.IImsUt;

import com.android.ims.internal.ImsCallSession;

import android.telephony.ims.ImsCallSession;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.ExponentialBackoff;
@@ -2101,21 +2101,13 @@ public class ImsManager { 


    public void onSmsReady() throws ImsException{

        try {

            mImsServiceProxy.onSmsReady();

            mMmTelFeatureConnection.onSmsReady();

        } catch (RemoteException e) {

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

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

        }

    }



    public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback) {

        // TODO: implement (coming in ag/3472519)

    }



    public void addCapabilitiesCallback(ImsFeature.CapabilityCallback callback) {

        // TODO: implement (coming in ag/3472519)

    }



    /**

     * Gets the Multi-Endpoint interface to subscribe to multi-enpoint notifications..

     *