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

Commit d36b7bbc authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of atel.lnx.2.0-00007. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1044029   I6c0887970d57ad4377270470e10517daed3de71d   IMS: Fix CF notification when enable through MMI code
1045115   Ibb7aeae1cc5718e3daccf4c890760217f734fdb8   IMS: Pass phoneId to ImsManager when getting the ImsServ
646971   I6858e47e669ad5068481d516fb36606e7cb55bb6   Fix the roaming searching text display in standby screen
1035748   I4ec7aa106f65a763809bd3d9392b56882216f132   MSIM: Fix to handle timeout related finish response
1006963   I9f5d91e8454eff0b5da8b6c5605bd19fa353b34e   Broadcast onSubscriptionChange notification when display

Change-Id: I9a3c1c90781ba6d745102ef5bdf854e2663d03d3
CRs-Fixed: 1035748, 1006963, 1044029, 1045115, 646971
parents 6a481aa3 a4be199c

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

+2 −2
Original line number Diff line number Diff line
@@ -508,10 +508,10 @@ public class ProxyController { 


            // Increment the sessionId as we are completing the transaction below

            // so we don't want it completed when the FINISH phase is done.

            int uniqueDifferentId = mUniqueIdGenerator.getAndIncrement();

            mRadioCapabilitySessionId = mUniqueIdGenerator.getAndIncrement();

            // send FINISH request with fail status and then uniqueDifferentId

            mTransactionFailed = true;

            issueFinish(uniqueDifferentId);

            issueFinish(mRadioCapabilitySessionId);

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -3102,7 +3102,8 @@ public class ServiceStateTracker extends Handler { 
            if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded()) &&

                    (!isRatLte(mSS.getRilVoiceRadioTechnology()) ||

                            mPhone.getContext().getResources().getBoolean(com.android.internal.R.

                                    bool.config_LTE_eri_for_network_name))) {

                                    bool.config_LTE_eri_for_network_name)) &&

                                    !mIsSubscriptionFromRuim) {

                // Only when CDMA is in service, ERI will take effect

                String eriText = mSS.getOperatorAlphaLong();

                // Now the Phone sees the new ServiceState so it can get the new ERI text

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

+2 −10
Original line number Diff line number Diff line
@@ -425,17 +425,12 @@ public class SubscriptionInfoUpdater extends Handler { 
            ContentResolver contentResolver = mContext.getContentResolver();



            if (msisdn != null) {

                ContentValues number = new ContentValues(1);

                number.put(SubscriptionManager.NUMBER, msisdn);

                contentResolver.update(SubscriptionManager.CONTENT_URI, number,

                        SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "="

                        + Long.toString(subId), null);

                   SubscriptionController.getInstance().setDisplayNumber(msisdn, subId);

            }



            SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(subId);

            String nameToSet;

            String simCarrierName = tm.getSimOperatorName(subId);

            ContentValues name = new ContentValues(1);



            if (subInfo != null && subInfo.getNameSource() !=

                    SubscriptionManager.NAME_SOURCE_USER_INPUT) {
@@ -444,11 +439,8 @@ public class SubscriptionInfoUpdater extends Handler { 
                } else {

                    nameToSet = "CARD " + Integer.toString(slotId + 1);

                }

                name.put(SubscriptionManager.DISPLAY_NAME, nameToSet);

                logd("sim name = " + nameToSet);

                contentResolver.update(SubscriptionManager.CONTENT_URI, name,

                        SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID

                        + "=" + Long.toString(subId), null);

                SubscriptionController.getInstance().setDisplayName(nameToSet, subId);

            }



            /* Update preferred network type and network selection mode on SIM change.

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+8 −0
Original line number Diff line number Diff line
@@ -625,6 +625,14 @@ public class ImsPhone extends ImsPhoneBase { 
        sendMessage(obtainMessage(EVENT_CALL_RING, ar));

    }



    @Override

    public void setVoiceCallForwardingFlag(int line, boolean enable, String number) {

        IccRecords r = getIccRecords();

        if (r != null) {

            setVoiceCallForwardingFlag(r, line, enable, number);

        }

    }



    @Override

    public void setMute(boolean muted) {

        mCT.setMute(muted);

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        try {

            mServiceId = mImsManager.open(ImsServiceClass.MMTEL,

                    createIncomingCallPendingIntent(),

                    mImsConnectionStateListener);

                    mImsConnectionStateListener, mPhone.getPhoneId());



            mImsManager.setImsConfigListener(mImsConfigListener);