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

Commit 0dcf6924 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "cp_rm_dyn_ims_config", "support_multiple_bind_ims" 

* changes:
  Add support for binding multiple features per slot (1/2)
  Remove compat version of ImsService binding
parents 19a592cb 7555f062

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

+8 −74
Original line number Original line Diff line number Diff line
@@ -19,10 +19,8 @@ package com.android.internal.telephony; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.annotation.UnsupportedAppUsage;

import android.app.BroadcastOptions;

import android.app.BroadcastOptions;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.SharedPreferences;

import android.net.LinkProperties;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;
@@ -116,33 +114,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 




    protected final int USSD_MAX_QUEUE = 10;

    protected final int USSD_MAX_QUEUE = 10;





    private BroadcastReceiver mImsIntentReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            Rlog.d(LOG_TAG, "mImsIntentReceiver: action " + intent.getAction());

            if (intent.hasExtra(ImsManager.EXTRA_PHONE_ID)) {

                int extraPhoneId = intent.getIntExtra(ImsManager.EXTRA_PHONE_ID,

                        SubscriptionManager.INVALID_PHONE_INDEX);

                Rlog.d(LOG_TAG, "mImsIntentReceiver: extraPhoneId = " + extraPhoneId);

                if (extraPhoneId == SubscriptionManager.INVALID_PHONE_INDEX ||

                        extraPhoneId != getPhoneId()) {

                    return;

                }

            }



            synchronized (Phone.lockForRadioTechnologyChange) {

                if (intent.getAction().equals(ImsManager.ACTION_IMS_SERVICE_UP)) {

                    mImsServiceReady = true;

                    updateImsPhone();

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

                } else if (intent.getAction().equals(ImsManager.ACTION_IMS_SERVICE_DOWN)) {

                    mImsServiceReady = false;

                    updateImsPhone();

                }

            }

        }

    };



    // Key used to read and write the saved network selection numeric value

    // Key used to read and write the saved network selection numeric value

    public static final String NETWORK_SELECTION_KEY = "network_selection_key";

    public static final String NETWORK_SELECTION_KEY = "network_selection_key";

    // Key used to read and write the saved network selection operator name

    // Key used to read and write the saved network selection operator name
@@ -323,7 +294,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    @UnsupportedAppUsage

    @UnsupportedAppUsage

    protected int mPhoneId;

    protected int mPhoneId;





    private boolean mImsServiceReady = false;

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    protected Phone mImsPhone = null;

    protected Phone mImsPhone = null;
@@ -586,34 +556,20 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    }

    }





    /**

    /**

     * Start listening for IMS service UP/DOWN events. If using the new ImsResolver APIs, we should

     * Start setup of ImsPhone, which will start trying to connect to the ImsResolver. Will not be

     * always be setting up ImsPhones.

     * called if this device does not support FEATURE_IMS_TELEPHONY.

     */

     */

    public void startMonitoringImsService() {

    public void createImsPhone() {

        if (getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {

        if (getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {

            return;

            return;

        }

        }





        synchronized(Phone.lockForRadioTechnologyChange) {

        synchronized(Phone.lockForRadioTechnologyChange) {

            IntentFilter filter = new IntentFilter();

            if (mImsPhone == null) {

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

                mImsPhone = PhoneFactory.makeImsPhone(mNotifier, this);

            // Don't listen to deprecated intents using the new dynamic binding.

                CallManager.getInstance().registerPhone(mImsPhone);

            if (imsManager != null && !imsManager.isDynamicBinding()) {

                mImsPhone.registerForSilentRedial(

                filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);

                        this, EVENT_INITIATE_SILENT_REDIAL, null);

                filter.addAction(ImsManager.ACTION_IMS_SERVICE_DOWN);

                mContext.registerReceiver(mImsIntentReceiver, filter);

            }



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

            // intent). Also, when using new ImsResolver APIs, the service will be available soon,

            // so start trying to bind.

            if (imsManager != null) {

                // If it is dynamic binding, kick off ImsPhone creation now instead of waiting for

                // the service to be available.

                if (imsManager.isDynamicBinding() || imsManager.isServiceAvailable()) {

                    mImsServiceReady = true;

                    updateImsPhone();

                }

            }

            }

        }

        }

    }

    }
@@ -3461,28 +3417,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    public void dispose() {

    public void dispose() {

    }

    }





    private void updateImsPhone() {

        Rlog.d(LOG_TAG, "updateImsPhone"

                + " mImsServiceReady=" + mImsServiceReady);



        if (mImsServiceReady && (mImsPhone == null)) {

            mImsPhone = PhoneFactory.makeImsPhone(mNotifier, this);

            CallManager.getInstance().registerPhone(mImsPhone);

            mImsPhone.registerForSilentRedial(

                    this, EVENT_INITIATE_SILENT_REDIAL, null);

        } else if (!mImsServiceReady && (mImsPhone != null)) {

            CallManager.getInstance().unregisterPhone(mImsPhone);

            mImsPhone.unregisterForSilentRedial(this);



            mImsPhone.dispose();

            // Potential GC issue if someone keeps a reference to ImsPhone.

            // However: this change will make sure that such a reference does

            // not access functions through NULL pointer.

            //mImsPhone.removeReferences();

            mImsPhone = null;

        }

    }



    /**

    /**

     * Dials a number.

     * Dials a number.

     *

     *

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

+3 −8
Original line number Original line Diff line number Diff line
@@ -211,24 +211,19 @@ public class PhoneFactory { 
                // Only bring up IMS if the device supports having an IMS stack.

                // Only bring up IMS if the device supports having an IMS stack.

                if (context.getPackageManager().hasSystemFeature(

                if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_TELEPHONY_IMS)) {

                        PackageManager.FEATURE_TELEPHONY_IMS)) {

                    // 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.

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

                    String defaultImsPackage = sContext.getResources().getString(

                    String defaultImsPackage = sContext.getResources().getString(

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

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

                    // Start ImsResolver and bind to ImsServices.

                    // Start ImsResolver and bind to ImsServices.

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

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

                    sImsResolver = new ImsResolver(sContext, defaultImsPackage, numPhones,

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

                            isDynamicBinding);

                    sImsResolver.initialize();

                    sImsResolver.initialize();

                    // Start monitoring after defaults have been made.

                    // Start monitoring after defaults have been made.

                    // Default phone must be ready before ImsPhone is created because ImsService

                    // Default phone must be ready before ImsPhone is created because ImsService

                    // might need it when it is being opened. This should initialize multiple

                    // might need it when it is being opened. This should initialize multiple

                    // ImsPhones for ImsResolver implementations of ImsService.

                    // ImsPhones for ImsResolver implementations of ImsService.

                    for (int i = 0; i < numPhones; i++) {

                    for (int i = 0; i < numPhones; i++) {

                        sPhones[i].startMonitoringImsService();

                        sPhones[i].createImsPhone();

                    }

                    }

                } else {

                } else {

                    Rlog.i(LOG_TAG, "IMS is not supported on this device, skipping ImsResolver.");

                    Rlog.i(LOG_TAG, "IMS is not supported on this device, skipping ImsResolver.");
@@ -284,7 +279,7 @@ public class PhoneFactory { 
                sPhones[i] = createPhone(context, i);

                sPhones[i] = createPhone(context, i);

                if (context.getPackageManager().hasSystemFeature(

                if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_TELEPHONY_IMS)) {

                        PackageManager.FEATURE_TELEPHONY_IMS)) {

                    sPhones[i].startMonitoringImsService();

                    sPhones[i].createImsPhone();

                }

                }

                sTelephonyNetworkFactories[i] = new TelephonyNetworkFactory(

                sTelephonyNetworkFactories[i] = new TelephonyNetworkFactory(

                        Looper.myLooper(), sPhones[i]);

                        Looper.myLooper(), sPhones[i]);

src/java/com/android/internal/telephony/ims/ImsResolver.java

+304 −307

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/ims/ImsServiceController.java

+22 −13
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import java.util.HashSet; 
import java.util.Iterator;

import java.util.Iterator;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentHashMap;

import java.util.stream.Collectors;





/**

/**

 * Manages the Binding lifecycle of one ImsService as well as the relevant ImsFeatures that the

 * Manages the Binding lifecycle of one ImsService as well as the relevant ImsFeatures that the
@@ -205,7 +206,7 @@ public class ImsServiceController { 
    private boolean mIsBound = false;

    private boolean mIsBound = false;

    private boolean mIsBinding = false;

    private boolean mIsBinding = false;

    // Set of a pair of slotId->feature

    // Set of a pair of slotId->feature

    private HashSet<ImsFeatureConfiguration.FeatureSlotPair> mImsFeatures;

    private Set<ImsFeatureConfiguration.FeatureSlotPair> mImsFeatures;

    // Binder interfaces to the features set in mImsFeatures;

    // Binder interfaces to the features set in mImsFeatures;

    private HashSet<ImsFeatureContainer> mImsFeatureBinders = new HashSet<>();

    private HashSet<ImsFeatureContainer> mImsFeatureBinders = new HashSet<>();

    private IImsServiceController mIImsServiceController;

    private IImsServiceController mIImsServiceController;
@@ -362,10 +363,11 @@ public class ImsServiceController { 
     * @return {@link true} if the service is in the process of being bound, {@link false} if it

     * @return {@link true} if the service is in the process of being bound, {@link false} if it

     * has failed.

     * has failed.

     */

     */

    public boolean bind(HashSet<ImsFeatureConfiguration.FeatureSlotPair> imsFeatureSet) {

    public boolean bind(Set<ImsFeatureConfiguration.FeatureSlotPair> imsFeatureSet) {

        synchronized (mLock) {

        synchronized (mLock) {

            if (!mIsBound && !mIsBinding) {

            if (!mIsBound && !mIsBinding) {

                mIsBinding = true;

                mIsBinding = true;

                sanitizeFeatureConfig(imsFeatureSet);

                mImsFeatures = imsFeatureSet;

                mImsFeatures = imsFeatureSet;

                grantPermissionsToService();

                grantPermissionsToService();

                Intent imsServiceIntent = new Intent(getServiceInterface()).setComponent(

                Intent imsServiceIntent = new Intent(getServiceInterface()).setComponent(
@@ -376,7 +378,7 @@ public class ImsServiceController { 
                mLocalLog.log("binding " + imsFeatureSet);

                mLocalLog.log("binding " + imsFeatureSet);

                Log.i(LOG_TAG, "Binding ImsService:" + mComponentName);

                Log.i(LOG_TAG, "Binding ImsService:" + mComponentName);

                try {

                try {

                    boolean bindSucceeded = startBindToService(imsServiceIntent,

                    boolean bindSucceeded = mContext.bindService(imsServiceIntent,

                            mImsServiceConnection, serviceFlags);

                            mImsServiceConnection, serviceFlags);

                    if (!bindSucceeded) {

                    if (!bindSucceeded) {

                        mLocalLog.log("    binding failed, retrying in "

                        mLocalLog.log("    binding failed, retrying in "
@@ -401,12 +403,18 @@ public class ImsServiceController { 
    }

    }





    /**

    /**

     * Starts the bind to the ImsService. Overridden by subclasses that need to access the service

     * Ensure the feature includes MMTEL when it supports EMERGENCY_MMTEL, if not, remove.

     * in a different fashion.

     */

     */

    protected boolean startBindToService(Intent intent, ImsServiceConnection connection,

    private void sanitizeFeatureConfig(Set<ImsFeatureConfiguration.FeatureSlotPair> features) {

            int flags) {

        Set<ImsFeatureConfiguration.FeatureSlotPair> emergencyMmtelFeatures = features.stream()

        return mContext.bindService(intent, connection, flags);

                .filter(feature -> feature.featureType == ImsFeature.FEATURE_EMERGENCY_MMTEL)

                .collect(Collectors.toSet());

        for (ImsFeatureConfiguration.FeatureSlotPair feature : emergencyMmtelFeatures) {

            if (!features.contains(new ImsFeatureConfiguration.FeatureSlotPair(feature.slotId,

                    ImsFeature.FEATURE_MMTEL))) {

                features.remove(feature);

            }

        }

    }

    }





    /**

    /**
@@ -436,8 +444,9 @@ public class ImsServiceController { 
     * ImsFeature that is removed, {@link IImsServiceController#removeImsFeature} is called.

     * ImsFeature that is removed, {@link IImsServiceController#removeImsFeature} is called.

     */

     */

    public void changeImsServiceFeatures(

    public void changeImsServiceFeatures(

            HashSet<ImsFeatureConfiguration.FeatureSlotPair> newImsFeatures)

            Set<ImsFeatureConfiguration.FeatureSlotPair> newImsFeatures)

            throws RemoteException {

            throws RemoteException {

        sanitizeFeatureConfig(newImsFeatures);

        synchronized (mLock) {

        synchronized (mLock) {

            if (mImsFeatures.equals(newImsFeatures)) {

            if (mImsFeatures.equals(newImsFeatures)) {

                return;

                return;
@@ -706,12 +715,12 @@ public class ImsServiceController { 
            IInterface f = createImsFeature(featurePair.slotId, featurePair.featureType,

            IInterface f = createImsFeature(featurePair.slotId, featurePair.featureType,

                    c.getCallback());

                    c.getCallback());

            addImsFeatureBinder(featurePair.slotId, featurePair.featureType, f);

            addImsFeatureBinder(featurePair.slotId, featurePair.featureType, f);

            // Signal ImsResolver to change supported ImsFeatures for this ImsServiceController

            mCallbacks.imsServiceFeatureCreated(featurePair.slotId, featurePair.featureType, this);

        } else {

        } else {

            // Don't update ImsService for emergency MMTEL feature.

            // Don't update ImsService for emergency MMTEL feature.

            Log.i(LOG_TAG, "supports emergency calling on slot " + featurePair.slotId);

            Log.i(LOG_TAG, "supports emergency calling on slot " + featurePair.slotId);

        }

        }

        // Signal ImsResolver to change supported ImsFeatures for this ImsServiceController

        mCallbacks.imsServiceFeatureCreated(featurePair.slotId, featurePair.featureType, this);

        // Send callback to ImsServiceProxy to change supported ImsFeatures including emergency

        // Send callback to ImsServiceProxy to change supported ImsFeatures including emergency

        // MMTEL state.

        // MMTEL state.

        sendImsFeatureCreatedCallback(featurePair.slotId, featurePair.featureType);

        sendImsFeatureCreatedCallback(featurePair.slotId, featurePair.featureType);
@@ -723,6 +732,8 @@ public class ImsServiceController { 
            Log.w(LOG_TAG, "removeImsServiceFeature called with null values.");

            Log.w(LOG_TAG, "removeImsServiceFeature called with null values.");

            return;

            return;

        }

        }

        // Signal ImsResolver to change supported ImsFeatures for this ImsServiceController

        mCallbacks.imsServiceFeatureRemoved(featurePair.slotId, featurePair.featureType, this);

        if (featurePair.featureType != ImsFeature.FEATURE_EMERGENCY_MMTEL) {

        if (featurePair.featureType != ImsFeature.FEATURE_EMERGENCY_MMTEL) {

            ImsFeatureStatusCallback callbackToRemove = mFeatureStatusCallbacks.stream().filter(c ->

            ImsFeatureStatusCallback callbackToRemove = mFeatureStatusCallbacks.stream().filter(c ->

                    c.mSlotId == featurePair.slotId && c.mFeatureType == featurePair.featureType)

                    c.mSlotId == featurePair.slotId && c.mFeatureType == featurePair.featureType)
@@ -732,8 +743,6 @@ public class ImsServiceController { 
                mFeatureStatusCallbacks.remove(callbackToRemove);

                mFeatureStatusCallbacks.remove(callbackToRemove);

            }

            }

            removeImsFeatureBinder(featurePair.slotId, featurePair.featureType);

            removeImsFeatureBinder(featurePair.slotId, featurePair.featureType);

            // Signal ImsResolver to change supported ImsFeatures for this ImsServiceController

            mCallbacks.imsServiceFeatureRemoved(featurePair.slotId, featurePair.featureType, this);

            try {

            try {

                removeImsFeature(featurePair.slotId, featurePair.featureType,

                removeImsFeature(featurePair.slotId, featurePair.featureType,

                        (callbackToRemove != null ? callbackToRemove.getCallback() : null));

                        (callbackToRemove != null ? callbackToRemove.getCallback() : null));

src/java/com/android/internal/telephony/ims/ImsServiceControllerCompat.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,7 @@ public class ImsServiceControllerCompat extends ImsServiceController { 
        return mServiceController != null;

        return mServiceController != null;

    }

    }





    protected MmTelInterfaceAdapter getInterface(int slotId, IImsFeatureStatusCallback c)

    private MmTelInterfaceAdapter getInterface(int slotId, IImsFeatureStatusCallback c)

            throws RemoteException {

            throws RemoteException {

        IImsMMTelFeature feature = mServiceController.createMMTelFeature(slotId, c);

        IImsMMTelFeature feature = mServiceController.createMMTelFeature(slotId, c);

        if (feature == null) {

        if (feature == null) {