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

Commit 8534d931 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Add ImsManager public API and refactor to use API. 

Modified ImsManager to "simulate" the new ImsMmtelManager
functionality until the framework can be refactored to
remove ImsManager entirely.

Test: atest FrameworksTelephonyTests
Merged-In: Id754f07e132e641f930e638ea06770ac1e8cae57
Change-Id: Id754f07e132e641f930e638ea06770ac1e8cae57
parent 3d4b2bd5

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

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



import android.net.Uri;

import android.telephony.ims.ImsMmTelManager;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.feature.MmTelFeature;
@@ -28,10 +29,10 @@ import java.util.Arrays; 
 * Listener for receiving notifications about changes to the IMS connection.

 * It provides a state of IMS registration between UE and IMS network, the service

 * availability of the local device during IMS registered.

 * @Deprecated Use {@link ImsRegistrationImplBase.Callback} instead.

 * @Deprecated Use {@link ImsMmTelManager.RegistrationCallback} instead.

 * @hide

 */

public class ImsConnectionStateListener extends ImsRegistrationImplBase.Callback {

public class ImsConnectionStateListener extends ImsMmTelManager.RegistrationCallback {



    @Override

    public final void onRegistered(@ImsRegistrationImplBase.ImsRegistrationTech int imsRadioTech) {
@@ -69,7 +70,7 @@ public class ImsConnectionStateListener extends ImsRegistrationImplBase.Callback 
     */

    public void onFeatureCapabilityChangedAdapter(

            @ImsRegistrationImplBase.ImsRegistrationTech int imsRadioTech,

            ImsFeature.Capabilities c) {

            MmTelFeature.MmTelCapabilities c) {

        // Size of ImsConfig.FeatureConstants

        int[] enabledCapabilities = new int[6];

        // UNKNOWN means disabled.

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

+167 −38
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.app.PendingIntent; 
import android.content.Context;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.HandlerExecutor;

import android.os.Looper;

import android.os.Message;

import android.os.Parcel;
@@ -31,6 +31,9 @@ import android.os.SystemProperties; 
import android.provider.Settings;

import android.telecom.TelecomManager;

import android.telephony.CarrierConfigManager;

import android.telephony.ims.ImsMmTelManager;

import android.telephony.ims.aidl.IImsCapabilityCallback;

import android.telephony.ims.aidl.IImsRegistrationCallback;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;
@@ -56,15 +59,18 @@ import java.io.PrintWriter; 
import java.util.ArrayList;

import java.util.HashMap;

import java.util.Set;

import java.util.concurrent.BlockingQueue;

import java.util.concurrent.ConcurrentLinkedDeque;

import java.util.concurrent.CopyOnWriteArraySet;

import java.util.concurrent.Executor;

import java.util.concurrent.LinkedBlockingDeque;

import java.util.concurrent.TimeUnit;



/**

 * Provides APIs for IMS services, such as initiating IMS calls, and provides access to

 * the operator's IMS network. This class is the starting point for any IMS actions.

 * You can acquire an instance of it with {@link #getInstance getInstance()}.</p>

 * <p>The APIs in this class allows you to:</p>

 *

 * @deprecated use {@link ImsMmTelManager} instead.

 * @hide

 */

public class ImsManager {
@@ -172,6 +178,8 @@ public class ImsManager { 
    private static final String TAG = "ImsManager";

    private static final boolean DBG = true;



    private static final int RESPONSE_WAIT_TIME_MS = 3000;



    /**

     * Helper class for managing a connection to the ImsManager when the ImsService is unavailable

     * or switches to another service.
@@ -538,8 +546,7 @@ public class ImsManager { 
     * supported on a per slot basis.

     */

    public boolean isNonTtyOrTtyOnVolteEnabled() {

        if (getBooleanCarrierConfig(

                CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL)) {

        if (isTtyOnVoLteCapable()) {

            return true;

        }
@@ -551,6 +558,10 @@ public class ImsManager { 
        return tm.getCurrentTtyMode() == TelecomManager.TTY_MODE_OFF;

    }



    public boolean isTtyOnVoLteCapable() {

        return getBooleanCarrierConfig(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL);

    }



    /**

     * Returns a platform configuration for VoLTE which may override the user setting.

     * @deprecated Does not support MSIM devices. Please use
@@ -1554,8 +1565,8 @@ public class ImsManager { 
     * @param listener To listen to IMS registration events; It cannot be null

     * @throws NullPointerException if {@code listener} is null

     * @throws ImsException if calling the IMS service results in an error

     * @deprecated use {@link #addRegistrationCallback(ImsRegistrationImplBase.Callback)} and

     * {@link #addCapabilitiesCallback(ImsFeature.CapabilityCallback)} instead.

     * @deprecated use {@link #addRegistrationCallback(ImsMmTelManager.RegistrationCallback)}

     * instead.

     */

    public void addRegistrationListener(ImsConnectionStateListener listener) throws ImsException {

        if (listener == null) {
@@ -1563,29 +1574,32 @@ public class ImsManager { 
        }

        addRegistrationCallback(listener);

        // connect the ImsConnectionStateListener to the new CapabilityCallback.

        addCapabilitiesCallback(new ImsFeature.CapabilityCallback() {

        addCapabilitiesCallback(new ImsMmTelManager.CapabilityCallback() {

            @Override

            public void onCapabilitiesStatusChanged(ImsFeature.Capabilities config) {

                listener.onFeatureCapabilityChangedAdapter(getRegistrationTech(), config);

            public void onCapabilitiesStatusChanged(

                    MmTelFeature.MmTelCapabilities capabilities) {

                listener.onFeatureCapabilityChangedAdapter(getRegistrationTech(), capabilities);

            }

        });

        log("Registration Callback registered.");

    }



    /**

     * Adds a callback that gets called when IMS registration has changed.

     * @param callback A {@link ImsRegistrationImplBase.Callback} that will notify the caller when

     *         IMS registration status has changed.

     * Adds a callback that gets called when IMS registration has changed for the slot ID

     * associated with this ImsManager.

     * @param callback A {@link ImsMmTelManager.RegistrationCallback} that will notify the caller

     *                 when IMS registration status has changed.

     * @throws ImsException when the ImsService connection is not available.

     */

    public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback)

    public void addRegistrationCallback(ImsMmTelManager.RegistrationCallback callback)

            throws ImsException {

        if (callback == null) {

            throw new NullPointerException("registration callback can't be null");

        }



        try {

            mMmTelFeatureConnection.addRegistrationCallback(callback);

            callback.setExecutor(getThreadExecutor());

            mMmTelFeatureConnection.addRegistrationCallback(callback.getBinder());

            log("Registration Callback registered.");

            // Only record if there isn't a RemoteException.

        } catch (RemoteException e) {
@@ -1596,33 +1610,58 @@ public class ImsManager { 


    /**

     * Removes a previously added registration callback that was added via

     * {@link #addRegistrationCallback(ImsRegistrationImplBase.Callback)} .

     * @param callback A {@link ImsRegistrationImplBase.Callback} that was previously added.

     * @throws ImsException when the ImsService connection is not available.

     * {@link #addRegistrationCallback(ImsMmTelManager.RegistrationCallback)} .

     * @param callback A {@link ImsMmTelManager.RegistrationCallback} that was previously added.

     */

    public void removeRegistrationListener(ImsRegistrationImplBase.Callback callback)

        throws ImsException {

    public void removeRegistrationListener(ImsMmTelManager.RegistrationCallback callback) {

        if (callback == null) {

            throw new NullPointerException("registration callback can't be null");

        }



        try {

            mMmTelFeatureConnection.removeRegistrationCallback(callback);

        mMmTelFeatureConnection.removeRegistrationCallback(callback.getBinder());

        log("Registration callback removed.");

        } catch (RemoteException e) {

            throw new ImsException("removeRegistrationCallback(IRIB)", e,

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

    }



    /**

     * Adds a callback that gets called when IMS registration has changed for a specific

     * subscription.

     *

     * @param callback A {@link ImsMmTelManager.RegistrationCallback} that will notify the caller

     *                 when IMS registration status has changed.

     * @param subId The subscription ID to register this registration callback for.

     * @throws RemoteException when the ImsService connection is not available.

     */

    public void addRegistrationCallbackForSubscription(IImsRegistrationCallback callback, int subId)

            throws RemoteException {

        if (callback == null) {

            throw new NullPointerException("registration callback can't be null");

        }

        mMmTelFeatureConnection.addRegistrationCallbackForSubscription(callback, subId);

        log("Registration Callback registered.");

        // Only record if there isn't a RemoteException.

    }



    /**

     * Removes a previously registered {@link ImsMmTelManager.RegistrationCallback} callback that is

     * associated with a specific subscription.

     */

    public void removeRegistrationCallbackForSubscription(IImsRegistrationCallback callback,

            int subId) {

        if (callback == null) {

            throw new NullPointerException("registration callback can't be null");

        }



        mMmTelFeatureConnection.removeRegistrationCallbackForSubscription(callback, subId);

    }



    /**

     * Adds a callback that gets called when MMTel capability status has changed, for example when

     * Voice over IMS or VT over IMS is not available currently.

     * @param callback A {@link ImsFeature.CapabilityCallback} that will notify the caller when

     * @param callback A {@link ImsMmTelManager.CapabilityCallback} that will notify the caller when

     *                 MMTel capability status has changed.

     * @throws ImsException when the ImsService connection is not available.

     */

    public void addCapabilitiesCallback(ImsFeature.CapabilityCallback callback)

    public void addCapabilitiesCallback(ImsMmTelManager.CapabilityCallback callback)

            throws ImsException {

        if (callback == null) {

            throw new NullPointerException("capabilities callback can't be null");
@@ -1630,7 +1669,8 @@ public class ImsManager { 


        checkAndThrowExceptionIfServiceUnavailable();

        try {

            mMmTelFeatureConnection.addCapabilityCallback(callback);

            callback.setExecutor(getThreadExecutor());

            mMmTelFeatureConnection.addCapabilityCallback(callback.getBinder());

            log("Capability Callback registered.");

            // Only record if there isn't a RemoteException.

        } catch (RemoteException e) {
@@ -1639,6 +1679,51 @@ public class ImsManager { 
        }

    }



    /**

     * Removes a previously registered {@link ImsMmTelManager.CapabilityCallback} callback.

     * @throws ImsException when the ImsService connection is not available.

     */

    public void removeCapabilitiesCallback(ImsMmTelManager.CapabilityCallback callback)

            throws ImsException {

        if (callback == null) {

            throw new NullPointerException("capabilities callback can't be null");

        }



        checkAndThrowExceptionIfServiceUnavailable();

        mMmTelFeatureConnection.removeCapabilityCallback(callback.getBinder());

    }



    /**

     * Adds a callback that gets called when IMS capabilities have changed for a specified

     * subscription.

     * @param callback A {@link ImsMmTelManager.CapabilityCallback} that will notify the caller

     *                 when the IMS Capabilities have changed.

     * @param subId The subscription that is associated with the callback.

     * @throws RemoteException when the ImsService connection is not available.

     */

    public void addCapabilitiesCallbackForSubscription(IImsCapabilityCallback callback, int subId)

            throws RemoteException {

        if (callback == null) {

            throw new NullPointerException("registration callback can't be null");

        }



        mMmTelFeatureConnection.addCapabilityCallbackForSubscription(callback, subId);

        log("Capability Callback registered for subscription.");

    }



    /**

     * Removes a previously registered {@link ImsMmTelManager.CapabilityCallback} that was

     * associated with a specific subscription.

     */

    public void removeCapabilitiesCallbackForSubscription(IImsCapabilityCallback callback,

            int subId) {

        if (callback == null) {

            throw new NullPointerException("capabilities callback can't be null");

        }



        mMmTelFeatureConnection.removeCapabilityCallbackForSubscription(callback, subId);

    }



    /**

     * Removes the registration listener from the IMS service.

     *
@@ -1654,14 +1739,9 @@ public class ImsManager { 
        }



        checkAndThrowExceptionIfServiceUnavailable();

        try {

            mMmTelFeatureConnection.removeRegistrationCallback(listener);

        mMmTelFeatureConnection.removeRegistrationCallback(listener.getBinder());

        log("Registration Callback/Listener registered.");

        // Only record if there isn't a RemoteException.

        } catch (RemoteException e) {

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

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

        }

    }



    public @ImsRegistrationImplBase.ImsRegistrationTech int getRegistrationTech() {
@@ -1899,6 +1979,48 @@ public class ImsManager { 
        thread.start();

    }



    public boolean queryMmTelCapability(

            @MmTelFeature.MmTelCapabilities.MmTelCapability int capability,

            @ImsRegistrationImplBase.ImsRegistrationTech int radioTech) throws ImsException {

        checkAndThrowExceptionIfServiceUnavailable();



        BlockingQueue<Boolean> result = new LinkedBlockingDeque<>(1);



        try {

            mMmTelFeatureConnection.queryEnabledCapabilities(capability, radioTech,

                    new IImsCapabilityCallback.Stub() {

                        @Override

                        public void onQueryCapabilityConfiguration(int resCap, int resTech,

                                boolean enabled) {

                            if (resCap == capability && resTech == radioTech) {

                                result.offer(enabled);

                            }

                        }



                        @Override

                        public void onChangeCapabilityConfigurationError(int capability,

                                int radioTech, int reason) {



                        }



                        @Override

                        public void onCapabilitiesStatusChanged(int config) {



                        }

                    });

        } catch (RemoteException e) {

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

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

        }



        try {

            return result.poll(RESPONSE_WAIT_TIME_MS, TimeUnit.MILLISECONDS);

        } catch (InterruptedException e) {

            Log.w(TAG, "queryMmTelCapability: interrupted while waiting for response");

        }

        return false;

    }



    public void setRttEnabled(boolean enabled) {

        try {

            if (enabled) {
@@ -1979,6 +2101,13 @@ public class ImsManager { 
        return mMmTelFeatureConnection.getFeatureState();

    }



    private Executor getThreadExecutor() {

        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        return new HandlerExecutor(new Handler(Looper.myLooper()));

    }



    /**

     * Get the boolean config from carrier config manager.

     *

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

+272 −54

File changed.

Preview size limit exceeded, changes collapsed.