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

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

Merge changes from topics "IMS provisioned value refactor", "ims_apis" am: 0693a340 

am: ebaba786

Change-Id: Ia0f5d68e7c4c70b706d2b7a1614d937c79fd62c0
parents 81bcd248 ebaba786

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

tests/telephonytests/src/com/android/internal/telephony/ims/ImsManagerTest.java

+11 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class ImsManagerTest extends TelephonyTest { 
    private static final String UNSET_PROVISIONED_STRING = "unset";

    private static final boolean ENHANCED_4G_MODE_DEFAULT_VAL = true;

    private static final boolean ENHANCED_4G_ENABLE_DEFAULT_VAL = true;

    private static final boolean ENHANCED_4G_MODE_EDITABLE = true;

    private static final boolean WFC_IMS_ENABLE_DEFAULT_VAL = false;

    private static final boolean WFC_IMS_ROAMING_ENABLE_DEFAULT_VAL = true;

    private static final boolean VT_IMS_ENABLE_DEFAULT_VAL = true;
@@ -55,8 +56,11 @@ public class ImsManagerTest extends TelephonyTest { 
    private static final int WFC_IMS_ROAMING_MODE_DEFAULT_VAL = 3;



    PersistableBundle mBundle;

    @Mock IBinder mBinder;

    @Mock ImsConfigImplBase mImsConfigImplBaseMock;



    @Mock

    IBinder mBinder;

    @Mock

    ImsConfigImplBase mImsConfigImplBaseMock;

    Hashtable<Integer, Integer> mProvisionedIntVals = new Hashtable<>();

    Hashtable<Integer, String> mProvisionedStringVals = new Hashtable<>();

    ImsConfigImplBase.ImsConfigStub mImsConfigStub;
@@ -77,6 +81,8 @@ public class ImsManagerTest extends TelephonyTest { 
        mServiceManagerMockedServices.put("isub", mBinder);



        mImsManagerInstances.remove(mPhoneId);



        setDefaultValues();

    }



    @After
@@ -105,8 +111,6 @@ public class ImsManagerTest extends TelephonyTest { 
        doReturn("-1").when(mSubscriptionController)

                .getSubscriptionProperty(anyInt(), anyString(), anyString());



        setDefaultValues();



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



        assertEquals(WFC_IMS_ENABLE_DEFAULT_VAL, imsManager.isWfcEnabledByUser());
@@ -163,6 +167,9 @@ public class ImsManagerTest extends TelephonyTest { 
                eq(SubscriptionManager.VT_IMS_ENABLED),

                eq("0"));



        // enhanced 4g mode must be editable to use setEnhanced4gLteModeSetting

        mBundle.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL,

                ENHANCED_4G_MODE_EDITABLE);

        imsManager.setEnhanced4gLteModeSetting(true);

        verify(mSubscriptionController, times(1)).setSubscriptionProperty(

                eq(mSubId[0]),