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

Commit 0693a340 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge changes from topics "IMS provisioned value refactor", "ims_apis" 

* changes:
  Adding more ImsManager test.
  Adds compat layer for older devices when IMS binding
  Create ImsService API compat layer
  Change ImsService API namespaces
  Integrate new MMTel APIs into the platform
  Integrate new ImsCallSessionListener
parents 87f27d0b ca4cfab7

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+8 −2
Original line number Diff line number Diff line
@@ -2294,8 +2294,14 @@ public class GsmCdmaPhone extends Phone { 
                        config_switch_phone_on_voice_reg_state_change)) {

                    mCi.getVoiceRadioTechnology(obtainMessage(EVENT_REQUEST_VOICE_RADIO_TECH_DONE));

                }

                // Force update IMS service

                ImsManager.getInstance(mContext, mPhoneId).updateImsServiceConfig(true);

                // Force update IMS service if it is available, if it isn't the config will be

                // updated when ImsPhoneCallTracker opens a connection.

                ImsManager imsManager = ImsManager.getInstance(mContext, mPhoneId);

                if (imsManager.isServiceAvailable()) {

                    imsManager.updateImsServiceConfig(true);

                } else {

                    logd("ImsManager is not available to update CarrierConfig.");

                }



                // Update broadcastEmergencyCallStateChanges

                CarrierConfigManager configMgr = (CarrierConfigManager)

src/java/com/android/internal/telephony/ImsSmsDispatcher.java

+25 −31
Original line number Diff line number Diff line
@@ -16,32 +16,25 @@ 


package com.android.internal.telephony;



import android.app.Activity;

import android.os.RemoteException;

import android.os.Message;

import android.app.PendingIntent;

import android.app.PendingIntent.CanceledException;

import android.provider.Telephony.Sms;

import android.content.Intent;

import android.telephony.Rlog;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.aidl.IImsSmsListener;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.telephony.ims.stub.ImsSmsImplBase;

import android.telephony.ims.stub.ImsSmsImplBase.SendStatusResult;

import android.provider.Telephony.Sms.Intents;

import android.util.Pair;



import com.android.ims.ImsException;

import com.android.ims.ImsManager;

import com.android.ims.ImsServiceProxy;

import com.android.ims.internal.IImsSmsListener;

import com.android.ims.MmTelFeatureConnection;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;

import com.android.internal.telephony.util.SMSDispatcherUtil;

import com.android.internal.telephony.gsm.SmsMessage;



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

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

import android.telephony.ims.internal.stub.SmsImplBase;

import android.telephony.ims.internal.stub.SmsImplBase.SendStatusResult;

import android.telephony.ims.internal.stub.SmsImplBase.StatusReportResult;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.provider.Telephony.Sms.Intents;

import android.util.Pair;



import java.util.HashMap;

import java.util.Map;
@@ -51,6 +44,7 @@ import java.util.concurrent.atomic.AtomicInteger; 
/**

 * Responsible for communications with {@link com.android.ims.ImsManager} to send/receive messages

 * over IMS.

 * @hide

 */

public class ImsSmsDispatcher extends SMSDispatcher {

    // Initial condition for ims connection retry.
@@ -107,7 +101,7 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                }



                @Override

                public void onDeregistered(com.android.ims.ImsReasonInfo info) {

                public void onDeregistered(ImsReasonInfo info) {

                    Rlog.d(TAG, "onImsDisconnected imsReasonInfo=" + info);

                    synchronized (mLock) {

                        mIsRegistered = false;
@@ -127,12 +121,12 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
    };



    // Callback fires when ImsManager MMTel Feature changes state

    private ImsServiceProxy.IFeatureUpdate mNotifyStatusChangedCallback =

            new ImsServiceProxy.IFeatureUpdate() {

    private MmTelFeatureConnection.IFeatureUpdate mNotifyStatusChangedCallback =

            new MmTelFeatureConnection.IFeatureUpdate() {

                @Override

                public void notifyStateChanged() {

                    try {

                        int status = getImsManager().getImsServiceStatus();

                        int status = getImsManager().getImsServiceState();

                        Rlog.d(TAG, "Status Changed: " + status);

                        switch (status) {

                            case android.telephony.ims.feature.ImsFeature.STATE_READY: {
@@ -144,7 +138,7 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                            }

                            case android.telephony.ims.feature.ImsFeature.STATE_INITIALIZING:

                                // fall through

                            case android.telephony.ims.feature.ImsFeature.STATE_NOT_AVAILABLE:

                            case ImsFeature.STATE_UNAVAILABLE:

                                synchronized (mLock) {

                                    mIsImsServiceUp = false;

                                }
@@ -174,18 +168,18 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                throw new IllegalArgumentException("Invalid token.");

            }

            switch(reason) {

                case SmsImplBase.SEND_STATUS_OK:

                case ImsSmsImplBase.SEND_STATUS_OK:

                    tracker.onSent(mContext);

                    break;

                case SmsImplBase.SEND_STATUS_ERROR:

                case ImsSmsImplBase.SEND_STATUS_ERROR:

                    tracker.onFailed(mContext, reason, 0 /* errorCode */);

                    mTrackers.remove(token);

                    break;

                case SmsImplBase.SEND_STATUS_ERROR_RETRY:

                case ImsSmsImplBase.SEND_STATUS_ERROR_RETRY:

                    tracker.mRetryCount += 1;

                    sendSms(tracker);

                    break;

                case SmsImplBase.SEND_STATUS_ERROR_FALLBACK:

                case ImsSmsImplBase.SEND_STATUS_ERROR_FALLBACK:

                    fallbackToPstn(token, tracker);

                    break;

                default:
@@ -208,8 +202,8 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                getImsManager().acknowledgeSmsReport(

                        token,

                        messageRef,

                        result.first ? SmsImplBase.STATUS_REPORT_STATUS_OK

                                : SmsImplBase.STATUS_REPORT_STATUS_ERROR);

                        result.first ? ImsSmsImplBase.STATUS_REPORT_STATUS_OK

                                : ImsSmsImplBase.STATUS_REPORT_STATUS_ERROR);

            } catch (ImsException e) {

                Rlog.e(TAG, "Failed to acknowledgeSmsReport(). Error: "

                        + e.getMessage());
@@ -229,8 +223,8 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                    getImsManager().acknowledgeSms(token,

                            0,

                            result == Intents.RESULT_SMS_HANDLED

                                    ? SmsImplBase.STATUS_REPORT_STATUS_OK

                                    : SmsImplBase.DELIVER_STATUS_ERROR);

                                    ? ImsSmsImplBase.STATUS_REPORT_STATUS_OK

                                    : ImsSmsImplBase.DELIVER_STATUS_ERROR);

                } catch (ImsException e) {

                    Rlog.e(TAG, "Failed to acknowledgeSms(). Error: " + e.getMessage());

                }
@@ -286,7 +280,7 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
        if (getImsManager().isServiceAvailable()) {

            return;

        }

        // remove callback so we do not receive updates from old ImsServiceProxy when switching

        // remove callback so we do not receive updates from old MmTelFeatureConnection when switching

        // between ImsServices.

        getImsManager().removeNotifyStatusChangedCallback(mNotifyStatusChangedCallback);

        // Exponential backoff during retry, limited to 32 seconds.

src/java/com/android/internal/telephony/Phone.java

+0 −5
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                } else if (intent.getAction().equals(ImsManager.ACTION_IMS_SERVICE_DOWN)) {

                    mImsServiceReady = false;

                    updateImsPhone();

                } else if (intent.getAction().equals(ImsConfig.ACTION_IMS_CONFIG_CHANGED)) {

                    int item = intent.getIntExtra(ImsConfig.EXTRA_CHANGED_ITEM, -1);

                    String value = intent.getStringExtra(ImsConfig.EXTRA_NEW_VALUE);

                    ImsManager.onProvisionedValueChanged(context, item, value);

                }

            }

        }
@@ -562,7 +558,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);

                filter.addAction(ImsManager.ACTION_IMS_SERVICE_DOWN);

            }

            filter.addAction(ImsConfig.ACTION_IMS_CONFIG_CHANGED);

            mContext.registerReceiver(mImsIntentReceiver, filter);



            // Monitor IMS service - but first poll to see if already up (could miss

src/java/com/android/internal/telephony/PhoneFactory.java

+8 −2
Original line number Diff line number Diff line
@@ -150,11 +150,17 @@ public class PhoneFactory { 
                   where as in single SIM mode only instance. isMultiSimEnabled() function checks

                   whether it is single SIM or multi SIM mode */

                int numPhones = TelephonyManager.getDefault().getPhoneCount();

                // Start ImsResolver and bind to ImsServices.

                // Return whether or not the device should use dynamic binding or the static

                // implementation (deprecated)

                boolean isDynamicBinding = sContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_dynamic_bind_ims);

                // Get the package name of the default IMS implementation.

                String defaultImsPackage = sContext.getResources().getString(

                        com.android.internal.R.string.config_ims_package);

                // Start ImsResolver and bind to ImsServices.

                Rlog.i(LOG_TAG, "ImsResolver: defaultImsPackage: " + defaultImsPackage);

                sImsResolver = new ImsResolver(sContext, defaultImsPackage, numPhones);

                sImsResolver = new ImsResolver(sContext, defaultImsPackage, numPhones,

                        isDynamicBinding);

                sImsResolver.populateCacheAndStartBind();



                int[] networkModes = new int[numPhones];

src/java/com/android/internal/telephony/TelephonyTester.java

+4 −4
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ import android.telephony.Rlog; 
import android.telephony.ServiceState;



import com.android.ims.ImsCall;

import com.android.ims.ImsCallProfile;

import com.android.ims.ImsConferenceState;

import com.android.ims.ImsExternalCallState;

import com.android.ims.ImsReasonInfo;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsConferenceState;

import android.telephony.ims.ImsExternalCallState;

import android.telephony.ims.ImsReasonInfo;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.imsphone.ImsExternalCallTracker;

import com.android.internal.telephony.imsphone.ImsPhone;