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

Commit c27ec61d authored by Calvin Pan's avatar Calvin Pan Committed by Android (Google) Code Review
Browse files

Merge changes from topic "VOIMS_OPT_IN_STATUS" into sc-dev 

* changes:
  Prevent GsmCdmaPhoneTest breaking by permission issue
  Add voims_opt_in_status column in sim info table
parents 2899b78c c7953caa

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

+39 −1
Original line number Diff line number Diff line
@@ -240,6 +240,17 @@ public class GsmCdmaPhone extends Phone { 
        }

    }



    /**

     * Used to create ImsManager instances, which may be injected during testing.

     */

    @VisibleForTesting

    public interface ImsManagerFactory {

        /**

         * Create a new instance of ImsManager for the specified phoneId.

         */

        ImsManager create(Context context, int phoneId);

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private IccSmsInterfaceManager mIccSmsInterfaceManager;
@@ -253,6 +264,8 @@ public class GsmCdmaPhone extends Phone { 
    private final SettingsObserver mSettingsObserver;

    private CarrierBandwidth mCarrierBandwidth = new CarrierBandwidth();



    private final ImsManagerFactory mImsManagerFactory;



    // Constructors



    public GsmCdmaPhone(Context context, CommandsInterface ci, PhoneNotifier notifier, int phoneId,
@@ -263,12 +276,23 @@ public class GsmCdmaPhone extends Phone { 
    public GsmCdmaPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,

                        boolean unitTestMode, int phoneId, int precisePhoneType,

                        TelephonyComponentFactory telephonyComponentFactory) {

        this(context, ci, notifier,

                unitTestMode, phoneId, precisePhoneType,

                telephonyComponentFactory,

                ImsManager::getInstance);

    }



    public GsmCdmaPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,

            boolean unitTestMode, int phoneId, int precisePhoneType,

            TelephonyComponentFactory telephonyComponentFactory,

            ImsManagerFactory imsManagerFactory) {

        super(precisePhoneType == PhoneConstants.PHONE_TYPE_GSM ? "GSM" : "CDMA",

                notifier, context, ci, unitTestMode, phoneId, telephonyComponentFactory);



        // phone type needs to be set before other initialization as other objects rely on it

        mPrecisePhoneType = precisePhoneType;

        mVoiceCallSessionStats = new VoiceCallSessionStats(mPhoneId, this);

        mImsManagerFactory = imsManagerFactory;

        initOnce(ci);

        initRatSpecific(precisePhoneType);

        // CarrierSignalAgent uses CarrierActionAgent in construction so it needs to be created
@@ -4659,4 +4683,18 @@ public class GsmCdmaPhone extends Phone { 
                loge("Invalid cdma_roaming_mode settings: " + config_cdma_roaming_mode);

        }

    }



    /**

     * Determines if IMS is enabled for call.

     *

     * @return {@code true} if IMS calling is enabled.

     */

    public boolean isImsUseEnabled() {

        ImsManager imsManager = mImsManagerFactory.create(mContext, mPhoneId);

        boolean imsUseEnabled = ((imsManager.isVolteEnabledByPlatform()

                && imsManager.isEnhanced4gLteModeSettingEnabledByUser())

                || (imsManager.isWfcEnabledByPlatform() && imsManager.isWfcEnabledByUser())

                && imsManager.isNonTtyOrTtyOnVolteEnabled());

        return imsUseEnabled;

    }

}

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

+0 −14
Original line number Diff line number Diff line
@@ -4355,20 +4355,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        mCi.unregisterForRadioCapabilityChanged(this);

    }



    /**

     * Determines if  IMS is enabled for call.

     *

     * @return {@code true} if IMS calling is enabled.

     */

    public boolean isImsUseEnabled() {

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

        boolean imsUseEnabled = ((imsManager.isVolteEnabledByPlatform()

                && imsManager.isEnhanced4gLteModeSettingEnabledByUser())

                || (imsManager.isWfcEnabledByPlatform() && imsManager.isWfcEnabledByUser())

                && imsManager.isNonTtyOrTtyOnVolteEnabled());

        return imsUseEnabled;

    }



    /**

     * Determines if the connection to IMS services are available yet.

     * @return {@code true} if the connection to IMS services are available.

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

+2 −0
Original line number Diff line number Diff line
@@ -3037,6 +3037,7 @@ public class SubscriptionController extends ISub.Stub { 
            case SubscriptionManager.WFC_IMS_ROAMING_ENABLED:

            case SubscriptionManager.IMS_RCS_UCE_ENABLED:

            case SubscriptionManager.CROSS_SIM_CALLING_ENABLED:

            case SubscriptionManager.VOIMS_OPT_IN_STATUS:

                value.put(propKey, Integer.parseInt(propValue));

                break;

            case SubscriptionManager.ALLOWED_NETWORK_TYPES:
@@ -3114,6 +3115,7 @@ public class SubscriptionController extends ISub.Stub { 
                        case SubscriptionManager.GROUP_UUID:

                        case SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES:

                        case SubscriptionManager.ALLOWED_NETWORK_TYPES:

                        case SubscriptionManager.VOIMS_OPT_IN_STATUS:

                            resultValue = cursor.getString(0);

                            break;

                        default:

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java

+4 −2
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import android.testing.TestableLooper; 


import androidx.test.filters.FlakyTest;



import com.android.ims.ImsManager;

import com.android.internal.telephony.test.SimulatedCommands;

import com.android.internal.telephony.test.SimulatedCommandsVerifier;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;
@@ -132,9 +133,10 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        super.setUp(getClass().getSimpleName());



        doReturn(false).when(mSST).isDeviceShuttingDown();

        doReturn(true).when(mImsManager).isVolteEnabledByPlatform();



        mPhoneUT = new GsmCdmaPhone(mContext, mSimulatedCommands, mNotifier, true, 0,

            PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory);

            PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory, (c, p) -> mImsManager);

        mPhoneUT.setVoiceCallSessionStats(mVoiceCallSessionStats);

        ArgumentCaptor<Integer> integerArgumentCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mUiccController).registerForIccChanged(eq(mPhoneUT), integerArgumentCaptor.capture(),
@@ -997,7 +999,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        };



        Phone phone = new GsmCdmaPhone(mContext, sc, mNotifier, true, 0,

                PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory);

                PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory, (c, p) -> mImsManager);

        phone.setVoiceCallSessionStats(mVoiceCallSessionStats);

        ArgumentCaptor<Integer> integerArgumentCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mUiccController).registerForIccChanged(eq(phone), integerArgumentCaptor.capture(),